Adds tests and removes do not merge comment.

zooba · zooba · commit e84ddecebff5 · 2017-09-06T17:12:51.000-07:00
diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py
@@ -66,7 +66,6 @@ def _find_vc2017():
     # initialize COM.
     all_packages = []
     def _getall():
-        # DO NOT MERGE - faulthandler triggers on non-fatal exception 0x40010006
         all_packages.extend(_findvs.findall())
     t = threading.Thread(target=_getall)
     t.start()
@@ -78,7 +77,7 @@ def _getall():
             if not os.path.isdir(vc_dir):
                 continue
             try:
-                version = tuple(int(i) for i in version_str.partition('.'))
+                version = tuple(int(i) for i in version_str.split('.'))
             except (ValueError, TypeError):
                 continue
             if version > best_version:
diff --git a/Lib/distutils/tests/test_msvccompiler.py b/Lib/distutils/tests/test_msvccompiler.py
@@ -76,12 +76,12 @@ def test_vcruntime_skip_copy(self):
         compiler = _msvccompiler.MSVCCompiler()
         compiler.initialize()
         dll = compiler._vcruntime_redist
-        self.assertTrue(os.path.isfile(dll))
+        self.assertTrue(os.path.isfile(dll), dll or "<None>")
 
         compiler._copy_vcruntime(tempdir)
 
         self.assertFalse(os.path.isfile(os.path.join(
-            tempdir, os.path.basename(dll))))
+            tempdir, os.path.basename(dll))), dll or "<None>")
 
     def test_get_vc_env_unicode(self):
         import distutils._msvccompiler as _msvccompiler
@@ -101,6 +101,30 @@ def test_get_vc_env_unicode(self):
             if old_distutils_use_sdk:
                 os.environ['DISTUTILS_USE_SDK'] = old_distutils_use_sdk
 
+    def test_get_vc2017(self):
+        import distutils._msvccompiler as _msvccompiler
+
+        # This function cannot be mocked, so pass it if we find VS 2017
+        # and mark it skipped if we do not.
+        version, path = _msvccompiler._find_vc2017()
+        if version:
+            self.assertGreaterEqual(version, 15)
+            self.assertTrue(os.path.isdir(path))
+        else:
+            raise unittest.SkipTest("VS 2017 is not installed")
+
+    def test_get_vc2015(self):
+        import distutils._msvccompiler as _msvccompiler
+
+        # This function cannot be mocked, so pass it if we find VS 2015
+        # and mark it skipped if we do not.
+        version, path = _msvccompiler._find_vc2015()
+        if version:
+            self.assertGreaterEqual(version, 14)
+            self.assertTrue(os.path.isdir(path))
+        else:
+            raise unittest.SkipTest("VS 2015 is not installed")
+
 def test_suite():
     return unittest.makeSuite(msvccompilerTestCase)
 
