Merge pull request #675 from JGoutin/patch-1

Fix test failure in Appveyor around MSVC support

Merge pull request #675 from JGoutin/patch-1
Fix test failure in Appveyor around MSVC support
9a6c9528 · Jason R. Coombs · GitHub · 8a133bd9 · 1a0644e0 · 9a6c9528
Commit 9a6c9528 authored Jul 23, 2016 by Jason R. Coombs Committed by GitHub Jul 23, 2016
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

setuptools/tests/test_msvc.py setuptools/tests/test_msvc.py +5 -3

No files found.
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -83,9 +83,11 @@ class TestModulePatch:
            with mock_reg():
                assert find_vcvarsall(9.0) is None

-                expected = distutils.errors.DistutilsPlatformError
-                with pytest.raises(expected) as exc:
+                try:
                    query_vcvarsall(9.0)
+                except Exception as exc:
+                    expected = distutils.errors.DistutilsPlatformError
+                    assert isinstance(exc, expected)
                    assert 'aka.ms/vcpython27' in str(exc)

    @pytest.yield_fixture