Fixes

Author: dtopuzov

core/base_class/BaseClass.py

@@ -32,7 +32,7 @@ def __copy_project_folder(cls, artifacts_folder):
                 shutil.copytree(src, dest)
                 shutil.rmtree(os.path.join(dest, "platforms"), ignore_errors=True)
                 shutil.rmtree(os.path.join(dest, "node_modules"), ignore_errors=True)
-            except Error:
+            except:
                 print "Failed to backup {0}".format(cls.app_name)
         else:
             print "No project " + src
@@ -62,11 +62,10 @@ def IsFailed(cls, res):
 
     @classmethod
     def setUpClass(cls, logfile=""):
-
-        Process.kill(proc_name='node', proc_cmdline='tns')
-        Process.kill('Xcode')
-        Process.kill('Safari')
         Process.kill('NativeScript Inspector')
+        Process.kill('Safari')
+        Process.kill('Xcode')
+        Process.kill(proc_name='node', proc_cmdline='tns')
 
         if logfile == "":
             logfile = os.path.join(OUTPUT_FOLDER, cls.__name__ + ".txt")
@@ -109,6 +108,6 @@ def tearDown(self):
 
     @classmethod
     def tearDownClass(cls):
-        Process.kill(proc_name='node', proc_cmdline='tns')
-        Process.kill('Safari')
         Process.kill('NativeScript Inspector')
+        Process.kill('Safari')
+        Process.kill(proc_name='node', proc_cmdline='tns')

core/device/device.py

@@ -110,6 +110,7 @@ def screen_match(device_type, device_name, device_id, expected_image, tolerance=
                 if File.exists(actual_image_path):
                     File.remove(actual_image_path)
                 Device.get_screen(device_type=device_type, device_id=device_id, file_path=actual_image_path)
+                time.sleep(1)
 
                 # Compare with expected image
                 if File.exists(actual_image_path):

core/osutils/screen.py

@@ -20,3 +20,6 @@ def save_screen(path):
                 im.save(path)
             except IOError:
                 print 'Failed to take screen of host OS'
+                if CURRENT_OS is OSType.OSX:
+                    print 'Retry...'
+                    run('screencapture ' + path, )

core/xcode/xcode.py

@@ -9,11 +9,16 @@
 class Xcode(object):
     @staticmethod
     def cleanup_cache():
-        """Cleanup Xcode cache and derived data"""
+        """
+        Cleanup Xcode cache and derived data
+        """
         run("rm -rf ~/Library/Developer/Xcode/DerivedData/*", COMMAND_TIMEOUT)
 
     @staticmethod
     def get_version():
-        """Get Xcode version"""
+        """
+        Get Xcode version
+        :return: Version as string.
+        """
         output = run("xcodebuild -version | grep Xcode")
         return output.replace("Xcode ", "")

runNose.py

@@ -42,6 +42,7 @@ def __extract_archive(file_name, folder):
 def disable_crash_report():
     if CURRENT_OS == OSType.OSX:
         run("defaults write com.apple.CrashReporter DialogType none")
+        run("defaults write -g ApplePersistence -bool no")
 
 def clean_npm():
     """Clean npm cache"""

tests/simulator/debug_ios_tests.py

@@ -2,6 +2,7 @@
 Tests for `tns debug ios` executed on iOS Simulator.
 """
 import os
+import time
 
 from core.base_class.BaseClass import BaseClass
 from core.device.device import Device
@@ -42,13 +43,13 @@ def setUp(self):
         BaseClass.setUp(self)
         Process.kill('Safari')
         Process.kill('NativeScript Inspector')
-        Process.kill('node')  # Stop 'node' to kill the livesync after each test method.
+        Process.kill('node')
 
     def tearDown(self):
         BaseClass.tearDown(self)
-        Process.kill('node')  # Stop 'node' to kill the livesync after each test method.
         Process.kill('Safari')
         Process.kill('NativeScript Inspector')
+        Process.kill('node')
 
     @classmethod
     def tearDownClass(cls):
@@ -91,23 +92,20 @@ def tearDownClass(cls):
     def __verify_debugger_start(self, log):
         strings = [self.SIMULATOR_ID, "Frontend client connected", "Backend socket created",
                    "NativeScript debugger attached"]
-        if Device.get_count(platform=Platform.IOS) > 0:
-            strings.append("Multiple devices found! Starting debugger on emulator")
         Tns.wait_for_log(log_file=log, string_list=strings, timeout=120, check_interval=10, clean_log=False)
+        time.sleep(10)
         output = File.read(log)
         assert "Frontend socket closed" not in output
         assert "Backend socket closed" not in output
         assert "NativeScript debugger detached" not in output
         assert Process.is_running('NativeScript Inspector')
 
     def __verify_debugger_attach(self, log):
-        log = Tns.debug_ios(attributes={'--path': self.app_name, '--start': ''})
         strings = ["Frontend client connected", "Backend socket created"]
-        if Device.get_count(platform=Platform.IOS) > 0:
-            strings.append("Multiple devices found! Starting debugger on emulator")
         Tns.wait_for_log(log_file=log, string_list=strings, timeout=120, check_interval=10, clean_log=False)
+        time.sleep(10)
         output = File.read(log)
-        assert "NativeScript debugger attached" not in output # This is not in output when you attach to running app
+        assert "NativeScript debugger attached" not in output  # This is not in output when you attach to running app
         assert "Frontend socket closed" not in output
         assert "Backend socket closed" not in output
         assert "NativeScript debugger detached" not in output
@@ -117,7 +115,7 @@ def test_001_debug_ios_simulator(self):
         """
         Default `tns debug ios` starts debugger (do not stop at the first code statement)
         """
-        log = Tns.debug_ios(attributes={'--path': self.app_name})
+        log = Tns.debug_ios(attributes={'--path': self.app_name, '--emulator': ''})
         self.__verify_debugger_start(log)
 
         # Verify app starts and do not stop on first line of code
@@ -129,7 +127,7 @@ def test_002_debug_ios_simulator_debug_brk(self):
         Starts debugger and stop at the first code statement.
         """
 
-        log = Tns.debug_ios(attributes={'--path': self.app_name, '--debug-brk': ''})
+        log = Tns.debug_ios(attributes={'--path': self.app_name, '--emulator': '', '--debug-brk': ''})
         self.__verify_debugger_start(log)
 
         # Verify app starts and do not stop on first line of code
@@ -143,11 +141,11 @@ def test_003_debug_ios_simulator_start(self):
 
         # Run the app and ensure it works
         log = Tns.run_ios(attributes={'--path': self.app_name, '--emulator': '', '--justlaunch': ''},
-                             assert_success=False, timeout=30)
+                          assert_success=False, timeout=30)
         TnsAsserts.prepared(app_name=self.app_name, platform=Platform.IOS, output=log, prepare=Prepare.SKIP)
         Device.screen_match(device_type=DeviceType.SIMULATOR, device_name=SIMULATOR_NAME,
                             device_id=self.SIMULATOR_ID, expected_image='livesync-hello-world_home')
 
         # Attach debugger
-        log = Tns.debug_ios(attributes={'--path': self.app_name, '--start': ''})
+        log = Tns.debug_ios(attributes={'--path': self.app_name, '--emulator': '', '--start': ''})
         self.__verify_debugger_attach(log=log)