Fix test_310_build_ios_with_copy_to(self):

Author: dtopuzov

core/tns/tns.py

@@ -357,6 +357,7 @@ def build_android(attributes={}, assert_success=True, tns_path=None, log_trace=F
         if assert_success:
             # Verify output of build command
             assert "Project successfully built" in output, "Build failed!" + os.linesep + output
+            assert "FAILURE" not in output
             assert "NOT FOUND" not in output  # Test for https://github.com/NativeScript/android-runtime/issues/390
             if log_trace:
                 assert "BUILD SUCCESSFUL" in output, "Build failed!" + os.linesep + output

tests/build/android/plugin_android_tests.py

@@ -113,14 +113,7 @@ def test_200_build_app_with_plugin_added_inside_project(self):
         os.chdir(current_dir)
         assert "Successfully installed plugin tns-plugin" in output
 
-        output = Tns.build_android(attributes={"--path": self.app_name})
-        assert successfully_prepared in output
-
-        assert build_successful in output
-        assert successfully_built in output
-        assert error not in output.lower()
-        assert "FAILURE" not in output
-
+        Tns.build_android(attributes={"--path": self.app_name}, log_trace=True)
         assert File.exists(self.app_name + "/platforms/android/build/outputs/apk/TestApp-debug.apk")
         assert File.exists(self.app_name + "/platforms/android/src/main/assets/app/tns_modules/tns-plugin/index.js")
 

tests/build/android/prepare_android_tests.py

@@ -129,15 +129,6 @@ def test_310_prepare_should_flatten_scoped_dependencies(self):
         ng_path = os.path.join(self.app_name, TnsAsserts.PLATFORM_ANDROID_NPM_MODULES_PATH, '@angular', 'core')
         assert File.exists(ng_path), "Scoped dependencies are flattened, please see #1783!"
 
-    @unittest.skip("TODO: Fix the test")
-    def test_320_unmet_peer_dependencies_do_not_stop_prepare(self):
-        Tns.create_app_ng(self.app_name, update_modules=True)
-        # Cleanup node_modules and let CLI install npm dependencies
-        Folder.cleanup(os.path.join(TEST_RUN_HOME, self.app_name, 'node_modules'))
-        output = Tns.prepare_android(attributes={"--path": self.app_name})
-        assert "requires a peer of tns-core-modules" in output, "No npm warning for unmet peer dependencies."
-        assert "but none was installed" in output, "No npm warning for unmet peer dependencies."
-
     def test_400_prepare_missing_or_missing_platform(self):
         Tns.create_app(self.app_name, update_modules=False)
 

tests/build/ios/build_ios_tests.py

@@ -124,10 +124,11 @@ def test_310_build_ios_with_copy_to(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, "--copy-to": "./"})
+        Tns.build_ios(attributes={"--path": self.app_name, "--copy-to": "./"}, log_trace=True)
         assert File.exists("TestApp.app")
 
-        Tns.build_ios(attributes={"--path": self.app_name, "--forDevice": "", "--release": "", "--copy-to": "./"})
+        Tns.build_ios(attributes={"--path": self.app_name, "--forDevice": "", "--release": "", "--copy-to": "./"},
+                      log_trace=True)
         assert File.exists("TestApp.ipa")
 
     def test_320_build_ios_with_custom_entitlements(self):