watchman: fixup recent test tweaks for windows

wez · Facebook Github Bot 5 · commit 93b67583c050 · 2016-09-09T10:33:13.000-07:00
Summary: Closes facebook#356 Reviewed By: sid0 fbshipit-source-id: 21223798900a435c90a8c148246d2f0877c46667
diff --git a/runtests.py b/runtests.py
@@ -297,9 +297,10 @@ def runner():
         WatchmanInstance.setSharedInstance(inst)
     except Exception as e:
         print('while starting watchman: %s' % str(e))
+        traceback.print_exc()
         broken = True
 
-    while True:
+    while not broken:
         test = tests_queue.get()
         try:
             if test == 'terminate':
@@ -370,7 +371,7 @@ def queue_jobs(tests):
     tests_run, tests_failed, tests_skipped, args.concurrency))
 
 if 'APPVEYOR' in os.environ:
-    shutil.copytree(temp_dir, 'logs')
+    shutil.copytree(temp_dir.get_dir(), 'logs')
     subprocess.call(['7z', 'a', 'logs.zip', 'logs'])
     subprocess.call(['appveyor', 'PushArtifact', 'logs.zip'])
 
diff --git a/tests/integration/TempDir.py b/tests/integration/TempDir.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from __future__ import unicode_literals
+# no unicode literals
 import os
 import shutil
 import sys
@@ -42,9 +42,8 @@ def __init__(self, keepAtShutdown=False):
         else:
             prefix = 'watchmantest'
 
-        self.temp_dir = os.path.realpath(
-            tempfile.mkdtemp(dir=parent_dir, prefix=prefix)
-        )
+        self.temp_dir = os.path.normcase(os.path.realpath(
+            tempfile.mkdtemp(dir=parent_dir, prefix=prefix)))
         if os.name != 'nt':
             # On some platforms, setting the setgid bit on a directory doesn't
             # work if the user isn't a member of the directory's group. Set the
diff --git a/tests/integration/test_perms.py b/tests/integration/test_perms.py
@@ -19,14 +19,17 @@
 import pywatchman
 
 
+def is_root():
+    return hasattr(os, 'geteuid') and os.geteuid() == 0
+
 @WatchmanTestCase.expand_matrix
 class TestPerms(WatchmanTestCase.WatchmanTestCase):
 
     def checkOSApplicability(self):
         if os.name == 'nt':
             self.skipTest('N/A on Windows')
 
-    @unittest.skipIf(os.geteuid() == 0, "N/A if root")
+    @unittest.skipIf(is_root(), "N/A if root")
     def test_permDeniedSubDir(self):
         root = self.mkdtemp()
         subdir = os.path.join(root, 'subdir')
@@ -40,7 +43,7 @@ def test_permDeniedSubDir(self):
         self.assertRegexpMatches(warning,
                                  'Marking this portion of the tree deleted')
 
-    @unittest.skipIf(os.geteuid() == 0, "N/A if root")
+    @unittest.skipIf(is_root(), "N/A if root")
     def test_permDeniedRoot(self):
         root = self.mkdtemp()
         os.chmod(root, 0)
diff --git a/tests/integration/test_trigger_chdir.py b/tests/integration/test_trigger_chdir.py
@@ -39,6 +39,10 @@ def fileHasValidJson(self, file_name):
         except Exception:
             return False
 
+    def checkOSApplicability(self):
+        if os.name == 'nt':
+            self.skipTest('no append on Windows')
+
     def test_triggerChdir(self):
         root = self.mkdtemp()
         os.mkdir(os.path.join(root, 'sub'))
