diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-15 20:48:10 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-15 20:48:10 -0500 |
| commit | a2c316791d7dc3ece9205518006075fa694fc296 (patch) | |
| tree | f61e247b0a533ba544179d6964cbb2f2f475b501 | |
| parent | 615188e68071c6f64c0d03ca21702cfec8c24b3c (diff) | |
| download | python-setuptools-bitbucket-a2c316791d7dc3ece9205518006075fa694fc296.tar.gz | |
Just the path is expected
| -rw-r--r-- | setuptools/tests/test_msvc9compiler.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py index 82c4d521..0790e3d2 100644 --- a/setuptools/tests/test_msvc9compiler.py +++ b/setuptools/tests/test_msvc9compiler.py @@ -113,7 +113,8 @@ class TestModulePatch: Ensure user's settings are preferred. """ result = distutils.msvc9compiler.find_vcvarsall(9.0) - assert user_preferred_setting == result + expected = os.path.join(user_preferred_setting, 'vcvarsall.bat') + assert expected == result @pytest.yield_fixture def local_machine_setting(self): @@ -134,7 +135,8 @@ class TestModulePatch: Ensure machine setting is honored if user settings are not present. """ result = distutils.msvc9compiler.find_vcvarsall(9.0) - assert local_machine_setting == result + expected = os.path.join(local_machine_setting, 'vcvarsall.bat') + assert expected == result @pytest.yield_fixture def x64_preferred_setting(self): @@ -160,7 +162,8 @@ class TestModulePatch: Ensure 64-bit system key is preferred. """ result = distutils.msvc9compiler.find_vcvarsall(9.0) - assert x64_preferred_setting == result + expected = os.path.join(x64_preferred_setting, 'vcvarsall.bat') + assert expected == result @staticmethod @contextlib.contextmanager @@ -173,4 +176,4 @@ class TestModulePatch: vcvarsall = os.path.join(result, 'vcvarsall.bat') with open(vcvarsall, 'w'): pass - yield vcvarsall + yield result |