examples\searchcommands_app\setup.py fixes for Windows

Also improved a message in testlib.py

Author: David Noble

examples/searchcommands_app/setup.py

@@ -22,9 +22,7 @@ def patch_os():
 
         def islink(path):
             attributes = get_file_attributes(path)
-            if attributes == -1:
-                raise OSError(format_error())
-            return (attributes & 0x400) != 0  # 0x400 == FILE_ATTRIBUTE_REPARSE_POINT
+            return attributes != -1 and (attributes & 0x400) != 0  # 0x400 == FILE_ATTRIBUTE_REPARSE_POINT
 
         os.path.islink = islink
 
@@ -207,17 +205,13 @@ def run(self):
         commands_conf = os.path.join(self.build_dir, 'default', 'commands.conf')
         source = os.path.join(self.build_dir, 'default', 'commands-scpv{}.conf'.format(self.scp_version))
 
-        if os.path.exists(commands_conf) and os.path.islink(commands_conf):
+        if os.path.isfile(commands_conf) or os.path.islink(commands_conf):
             os.remove(commands_conf)
-        else:
-            try:
-                os.path.islink(commands_conf)
-            except OSError:
-                pass
-            else:
-                os.remove(commands_conf)
+        elif os.path.exists(commands_conf):
+            message = 'Cannot create a link at "{}" because a file by that name already exists.'.format(commands_conf)
+            raise SystemError(message)
 
-        os.symlink(source, commands_conf)
+        shutil.copy(source, commands_conf)
         self._make_archive()
         return
 
@@ -339,8 +333,11 @@ def run(self):
         commands_conf = os.path.join(self.app_source, 'default', 'commands.conf')
         source = os.path.join(self.app_source, 'default', 'commands-scpv{}.conf'.format(self.scp_version))
 
-        if os.path.exists(commands_conf) or os.path.islink(commands_conf):
+        if os.path.islink(commands_conf):
             os.remove(commands_conf)
+        elif os.path.exists(commands_conf):
+            message = 'Cannot create a link at "{}" because a file by that name already exists.'.format(commands_conf)
+            raise SystemError(message)
 
         os.symlink(source, commands_conf)
         os.symlink(self.app_source, target)

tests/testlib.py

@@ -257,8 +257,8 @@ def tearDown(self):
                     self.service.apps.delete(appName)
                     wait(lambda: appName not in self.service.apps)
                 except HTTPError as error:
-                    if error.status != 500:
+                    if not (os.name == 'nt' and error.status == 500):
                         raise
-                    print 'Ignoring teardown error because it is likely spurious: {}'.format(error)
+                    print 'Ignoring failure to delete {} during tear down: {}'.format(appName, error)
         if self.service.restart_required:
             self.clear_restart_message()