aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests/test_msvc9compiler.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-01-15 20:48:10 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-01-15 20:48:10 -0500
commit903de3abdd20a96051cedad2f0f4287a3a4b11b5 (patch)
treef1c4162d949c1585a3c15d944d2c7e601feb2cd4 /setuptools/tests/test_msvc9compiler.py
parent3558c1a03584064e9bb86d3886009902eec6832d (diff)
downloadexternal_python_setuptools-903de3abdd20a96051cedad2f0f4287a3a4b11b5.tar.gz
external_python_setuptools-903de3abdd20a96051cedad2f0f4287a3a4b11b5.tar.bz2
external_python_setuptools-903de3abdd20a96051cedad2f0f4287a3a4b11b5.zip
Just the path is expected
Diffstat (limited to 'setuptools/tests/test_msvc9compiler.py')
-rw-r--r--setuptools/tests/test_msvc9compiler.py11
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