Make tests passing with NativeScript/nativescript-cli#3070

- Make tests passing with
NativeScript/nativescript-cli#3070
- Enable —provision tests for Xcode9

Author: dtopuzov

core/tns/tns.py

@@ -377,24 +377,26 @@ def build_android(attributes={}, assert_success=True, tns_path=None):
         return output
 
     @staticmethod
-    def build_ios(attributes={}, assert_success=True, tns_path=None):
+    def build_ios(attributes={}, assert_success=True, tns_path=None, log_trace=False):
 
         if "--provision" not in attributes.keys():
             attr = {"--teamId": DEVELOPMENT_TEAM}
             attributes.update(attr)
 
-        output = Tns.run_tns_command("build ios", attributes=attributes, tns_path=tns_path)
+        output = Tns.run_tns_command("build ios", attributes=attributes, tns_path=tns_path, log_trace=log_trace)
 
         app_name = Tns.__get_app_name_from_attributes(attributes=attributes)
         app_name = app_name.replace("\"", "")  # Handle projects with space
         app_id = Tns.__get_final_package_name(app_name, platform=Platform.IOS)
 
         if assert_success:
-            assert "BUILD SUCCEEDED" in output
             assert "Project successfully built" in output
             assert "ERROR" not in output
             assert "malformed" not in output
-            assert "CodeSign" in output
+
+            if log_trace:
+                assert "BUILD SUCCEEDED" in output
+                assert "CodeSign" in output
 
             # Verify release/debug builds
             if "--release" in attributes.keys():
@@ -410,9 +412,10 @@ def build_ios(attributes={}, assert_success=True, tns_path=None):
             device_folder = app_name + "/platforms/ios/build/device/"
             emu_folder = app_name + "/platforms/ios/build/emulator/"
             if "--forDevice" in attributes.keys() or "--for-device" in attributes.keys():
-                assert "build/device/" + app_id + ".app" in output
-                assert "ARCHIVE SUCCEEDED" in output
-                assert "EXPORT SUCCEEDED" in output
+                if log_trace:
+                    assert "build/device/" + app_id + ".app" in output
+                    assert "ARCHIVE SUCCEEDED" in output
+                    assert "EXPORT SUCCEEDED" in output
                 assert File.exists(device_folder + app_id + ".ipa"), "IPA file not found!"
                 bundle_content = File.read(device_folder + app_id + ".app/" + app_id)
                 xcode_project = Tns.__get_xcode_project_file(app_name)
@@ -422,7 +425,8 @@ def build_ios(attributes={}, assert_success=True, tns_path=None):
                     assert DEVELOPMENT_TEAM in xcode_project or DISTRIBUTION_PROVISIONING in xcode_project, \
                         "TeamID not passed to Xcode!"
             else:
-                assert "build/emulator/" + app_id + ".app" in output
+                if log_trace:
+                    assert "build/emulator/" + app_id + ".app" in output
                 assert File.exists(app_name + "/platforms/ios/" + app_id + "/" + app_id + "-Prefix.pch")
                 assert File.exists(emu_folder + app_id + ".app")
                 bundle_content = File.read(emu_folder + app_id + ".app/" + app_id)

tests/build/ios/build_ios_provision_tests.py

@@ -2,7 +2,6 @@
 Test for --provision options
 """
 import os
-import unittest
 
 from core.base_class.BaseClass import BaseClass
 from core.device.simulator import Simulator
@@ -47,14 +46,10 @@ def test_200_build_ios_list_provisions(self):
         assert DISTRIBUTION_PROVISIONING in output
         assert DEVELOPMENT_TEAM in output
 
-    @unittest.skipIf("9." in Xcode.get_version(),
-                     "Skip on Xcode 9 because of https://github.com/NativeScript/nativescript-cli/issues/3046")
     def test_201_build_ios_with_provision(self):
         build_attributes = {"--path": self.app_name, "--forDevice": "", "--release": "", "--provision": PROVISIONING}
         Tns.build_ios(attributes=build_attributes)
 
-    @unittest.skipIf("9." in Xcode.get_version(),
-                     "Skip on Xcode 9 because of https://github.com/NativeScript/nativescript-cli/issues/3046")
     def test_202_build_ios_with_distribution_provision(self):
         build_attributes = {"--path": self.app_name, "--forDevice": "", "--release": "",
                             "--provision": DISTRIBUTION_PROVISIONING}

tests/build/ios/build_ios_tests.py

@@ -59,17 +59,17 @@ def tearDownClass(cls):
     def test_001_build_ios(self):
         Tns.create_app(self.app_name)
         Tns.platform_add_ios(attributes={"--path": self.app_name, "--frameworkPath": IOS_RUNTIME_PATH})
-        Tns.build_ios(attributes={"--path": self.app_name})
+        Tns.build_ios(attributes={"--path": self.app_name}, log_trace=True)
 
         Folder.cleanup(os.path.join(self.app_name, 'platforms', 'ios'))
-        Tns.build_ios(attributes={"--path": self.app_name, "--release": ""})
+        Tns.build_ios(attributes={"--path": self.app_name, "--release": ""}, log_trace=True)
 
         Folder.cleanup(os.path.join(self.app_name, 'platforms', 'ios'))
-        Tns.build_ios(attributes={"--path": self.app_name, "--forDevice": ""})
+        Tns.build_ios(attributes={"--path": self.app_name, "--forDevice": ""}, log_trace=True)
 
         Folder.cleanup(os.path.join(self.app_name, 'platforms', 'ios'))
         Tns.platform_add_android(attributes={"--path": self.app_name, "--frameworkPath": ANDROID_RUNTIME_PATH})
-        Tns.build_ios(attributes={"--path": self.app_name, "--forDevice": "", "--release": ""})
+        Tns.build_ios(attributes={"--path": self.app_name, "--forDevice": "", "--release": ""}, log_trace=True)
 
         # Verify no aar and frameworks in platforms folder
         assert not File.pattern_exists(self.app_name + "/platforms/ios", "*.aar")
@@ -82,17 +82,17 @@ def test_001_build_ios(self):
         assert "armv7" in output
         assert "arm64" in output
 
-    def test_211_build_ios_inside_project(self):
+    def test_200_build_ios_inside_project(self):
         Tns.create_app(self.app_name)
         Tns.platform_add_ios(attributes={"--path": self.app_name, "--frameworkPath": IOS_RUNTIME_PATH})
         Folder.navigate_to(self.app_name)
         output = Tns.build_ios(tns_path=os.path.join("..", TNS_PATH), attributes={"--path": self.app_name},
-                               assert_success=False)
+                               assert_success=False, log_trace=True)
         Folder.navigate_to(TEST_RUN_HOME, relative_from_current_folder=False)
         assert "build/emulator/TestApp.app" in output
         assert File.exists(self.app_name + "/platforms/ios/build/emulator/TestApp.app")
 
-    def test_213_build_ios_platform_not_added_or_platforms_deleted(self):
+    def test_210_build_ios_platform_not_added_or_platforms_deleted(self):
         Tns.create_app(self.app_name_noplatform)
         Tns.build_ios(attributes={"--path": self.app_name_noplatform})