Added tests for Python version checking

inclement · inclement · commit 8637a208caaa · 2019-08-02T23:28:58.000+01:00
diff --git a/pythonforandroid/recommendations.py b/pythonforandroid/recommendations.py
@@ -192,11 +192,12 @@ def check_ndk_api(ndk_api, android_api):
                                                            minor=MIN_PYTHON_MINOR_VERSION))
 PY2_ERROR_TEXT = (
     'python-for-android no longer supports running under Python 2. Either upgrade to '
-    'Python {min_version} (recommended), or revert to python-for-android 2019.07.08. Note that '
-    'you *can* still target Python 2 on Android by including python2 in your requirements.').format(
+    'Python {min_version} or higher (recommended), or revert to python-for-android 2019.07.08. '
+    'Note that you *can* still target Python 2 on Android by including python2 in your '
+    'requirements.').format(
         min_version=MIN_PYTHON_VERSION)
 
-PY_MINOR_VERSION_ERROR_TEXT = (
+PY_VERSION_ERROR_TEXT = (
     'Your Python version {user_major}.{user_minor} is not supported by python-for-android, '
     'please upgrade to {min_version} or higher.'
     ).format(
@@ -206,8 +207,12 @@ def check_ndk_api(ndk_api, android_api):
 
 
 def check_python_version():
-    if sys.version_info.major < MIN_PYTHON_MAJOR_VERSION:
+    # Python 2 special cased because it's a major transition. In the
+    # future the major or minor versions can increment more quietly.
+    if sys.version_info.major == 2:
         raise BuildInterruptingException(PY2_ERROR_TEXT)
 
-    if sys.version_info.minor < MIN_PYTHON_MINOR_VERSION:
-        raise BuildInterruptingException(PY_MINOR_VERSION_ERROR_TEXT)
+    if (sys.version_info.major < MIN_PYTHON_MAJOR_VERSION or
+        sys.version_info.minor < MIN_PYTHON_MINOR_VERSION):
+
+        raise BuildInterruptingException(PY_VERSION_ERROR_TEXT)
diff --git a/tests/test_androidmodule_ctypes_finder.py b/tests/test_androidmodule_ctypes_finder.py
@@ -1,6 +1,12 @@
 
-import mock
-from mock import MagicMock
+# This test is still expected to support Python 2, as it tests
+# on-Android functionality that we still maintain
+try:  # Python 3+
+    from unittest import mock
+    from unittest.mock import MagicMock
+except:  # Python 2
+    import mock
+    from mock import MagicMock
 import os
 import shutil
 import sys
diff --git a/tests/test_recommendations.py b/tests/test_recommendations.py
@@ -1,18 +1,14 @@
 import unittest
 from os.path import join
-from sys import version as py_version
-
-try:
-    from unittest import mock
-except ImportError:
-    # `Python 2` or lower than `Python 3.3` does not
-    # have the `unittest.mock` module built-in
-    import mock
+from sys import version_info, version as py_version
+
+from unittest import mock
 from pythonforandroid.recommendations import (
     check_ndk_api,
     check_ndk_version,
     check_target_api,
     read_ndk_version,
+    check_python_version,
     MAX_NDK_VERSION,
     RECOMMENDED_NDK_VERSION,
     RECOMMENDED_TARGET_API,
@@ -33,7 +29,13 @@
     OLD_NDK_API_MESSAGE,
     NEW_NDK_MESSAGE,
     OLD_API_MESSAGE,
+    MIN_PYTHON_MAJOR_VERSION,
+    MIN_PYTHON_MINOR_VERSION,
+    PY2_ERROR_TEXT,
+    PY_VERSION_ERROR_TEXT,
 )
+import pythonforandroid.recommendations  # for mocking constants only, other imports explicit
+
 from pythonforandroid.util import BuildInterruptingException
 
 running_in_py2 = int(py_version[0]) < 3
@@ -202,3 +204,37 @@ def test_check_ndk_api_warning_old_ndk(self):
                 )
             ],
         )
+
+    def test_check_python_version(self):
+        """
+        With any version info lower than the minimum, we should get a
+        """
+        with mock.patch('sys.version_info') as fake_version_info:
+
+            # Major version is Python 2 => exception
+            fake_version_info.major = MIN_PYTHON_MAJOR_VERSION - 1
+            fake_version_info.minor = MIN_PYTHON_MINOR_VERSION
+            with self.assertRaises(BuildInterruptingException) as context:
+                check_python_version()
+            assert context.exception.message == PY2_ERROR_TEXT
+
+            # Major version too low => exception
+            # Using a float valued major version just to test the logic and avoid
+            # clashing with the Python 2 check
+            fake_version_info.major = MIN_PYTHON_MAJOR_VERSION - 0.1
+            fake_version_info.minor = MIN_PYTHON_MINOR_VERSION
+            with self.assertRaises(BuildInterruptingException) as context:
+                check_python_version()
+            assert context.exception.message == PY_VERSION_ERROR_TEXT
+
+            # Minor version too low => exception
+            fake_version_info.major = MIN_PYTHON_MAJOR_VERSION
+            fake_version_info.minor = MIN_PYTHON_MINOR_VERSION - 1
+            with self.assertRaises(BuildInterruptingException) as context:
+                check_python_version()
+            assert context.exception.message == PY_VERSION_ERROR_TEXT
+
+            # Version high enough => nothing interesting happens
+            fake_version_info.major = MIN_PYTHON_MAJOR_VERSION
+            fake_version_info.minor = MIN_PYTHON_MINOR_VERSION
+            check_python_version()
diff --git a/tox.ini b/tox.ini
@@ -17,7 +17,7 @@ setenv =
     PYTHONPATH={toxinidir}
 
 [testenv:py27]
-commands = pytest {posargs:tests/test_androidmodule_ctypes_finder.py}
+commands = pytest {posargs:tests/test_androidmodule_ctypes_finder.py tests/test_entrypoints_python2.py}
 
 [testenv:py3]
 # for py3 env we will get code coverage
