Skip to content

Commit e0b7c51

Browse files
committed
fix test_check_python_version
1 parent 9353c65 commit e0b7c51

File tree

1 file changed

+4
-30
lines changed

1 file changed

+4
-30
lines changed

test/framework/systemtools.py

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -850,54 +850,28 @@ def mock_python_ver(py_maj_ver, py_min_ver):
850850
error_pattern = r"EasyBuild is not compatible \(yet\) with Python 4.0"
851851
self.assertErrorRegex(EasyBuildError, error_pattern, check_python_version)
852852

853-
mock_python_ver(2, 5)
854-
error_pattern = r"Python 2.6 or higher is required when using Python 2, found Python 2.5"
853+
mock_python_ver(2, 6)
854+
error_pattern = r"Python 2.7 is required when using Python 2, found Python 2.6"
855855
self.assertErrorRegex(EasyBuildError, error_pattern, check_python_version)
856856

857857
# no problems when running with a supported Python version
858858
for pyver in [(2, 7), (3, 5), (3, 6), (3, 7)]:
859859
mock_python_ver(*pyver)
860860
self.assertEqual(check_python_version(), pyver)
861861

862-
mock_python_ver(2, 6)
863-
# deprecation warning triggers an error in test environment
864-
error_pattern = r"Running EasyBuild with Python 2.6 is deprecated"
865-
self.assertErrorRegex(EasyBuildError, error_pattern, check_python_version)
866-
867-
# we may trigger a deprecation warning below (when testing with Python 2.6)
868-
py26_depr_warning = "\nWARNING: Deprecated functionality, will no longer work in v5.0: "
869-
py26_depr_warning += "Running EasyBuild with Python 2.6 is deprecated"
870-
871-
self.allow_deprecated_behaviour()
872-
873-
# first test with mocked Python 2.6
874-
self.mock_stderr(True)
875-
check_python_version()
876-
stderr = self.get_stderr()
877-
self.mock_stderr(False)
878-
879-
# we should always get a deprecation warning here
880-
self.assertTrue(stderr.startswith(py26_depr_warning))
881-
882-
# restore Python version info to check with Python version used to run tests
883-
st.sys.version_info = self.orig_sys_version_info
884-
885862
# shouldn't raise any errors, since Python version used to run tests should be supported;
886863
self.mock_stderr(True)
887864
(py_maj_ver, py_min_ver) = check_python_version()
888865
stderr = self.get_stderr()
889866
self.mock_stderr(False)
867+
self.assertFalse(stderr)
890868

891869
self.assertTrue(py_maj_ver in [2, 3])
892870
if py_maj_ver == 2:
893-
self.assertTrue(py_min_ver in [6, 7])
871+
self.assertTrue(py_min_ver == 7)
894872
else:
895873
self.assertTrue(py_min_ver >= 5)
896874

897-
# only deprecation warning when actually testing with Python 2.6
898-
if sys.version_info[:2] == (2, 6):
899-
self.assertTrue(stderr.startswith(py26_depr_warning))
900-
901875
def test_pick_dep_version(self):
902876
"""Test pick_dep_version function."""
903877

0 commit comments

Comments
 (0)