diff options
Diffstat (limited to 'src/test_setup.py')
| -rw-r--r-- | src/test_setup.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/test_setup.py b/src/test_setup.py index b540ab2..56e14eb 100644 --- a/src/test_setup.py +++ b/src/test_setup.py @@ -23,7 +23,7 @@ # from __future__ import print_function -__revision__ = "src/test_setup.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan" +__revision__ = "src/test_setup.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan" """ Test how the setup.py script installs SCons. @@ -176,7 +176,7 @@ tar_gz = os.path.join(cwd, 'build', 'dist', '%s.tar.gz' % scons_version) zip = os.path.join(cwd, 'build', 'dist', '%s.zip' % scons_version) if os.path.isfile(zip): - try: + try: import zipfile except ImportError: pass @@ -185,9 +185,9 @@ if os.path.isfile(zip): for name in zf.namelist(): dname = os.path.dirname(name) - try: + try: os.makedirs(dname) - except FileExistsError: + except FileExistsError: pass # if the file exists, then delete it before writing # to it so that we don't end up trying to write to a symlink: @@ -325,8 +325,7 @@ test.must_have_installed(test.man_page_paths()) other_prefix = test.workpath('other-prefix') test.subdir(other_prefix) test.run(arguments = 'setup.py install --prefix=%s' % other_prefix) -test.fail_test(test.stderr().find("you'll have to change the search path yourself") - != -1) +test.fail_test("you'll have to change the search path yourself" in test.stderr()) # All done. test.pass_test() |