Run skipped tests again

Author: Dimitar Topuzov

core/tns/tns_verifications.py

@@ -1,6 +1,6 @@
-'''
+"""
 Verifications for NativeScript projects.
-'''
+"""
 import json
 import os
 import re
@@ -67,12 +67,12 @@ def _get_ios_modules_path(app_name):
 
     @staticmethod
     def created(app_name, output=None, full_check=True):
-        '''
+        """
         Assert application is created properly.
         :param app_name: App name
         :param output: Outout of `tns create command`
         :param full_check: If true everything will be checked. If false only console output will be checked.
-        '''
+        """
 
         # Assert console output is ok
         if output is not None:
@@ -97,11 +97,11 @@ def created(app_name, output=None, full_check=True):
 
     @staticmethod
     def created_ts(app_name, output=None):
-        '''
+        """
         Assert TypeScript application is created properly.
         :param app_name: App name
         :param output: Outout of `tns create command`
-        '''
+        """
 
         # First make sure base app is created
         TnsAsserts.created(app_name=app_name, output=output)
@@ -139,12 +139,12 @@ def created_ts(app_name, output=None):
 
     @staticmethod
     def platform_added(app_name, platform=Platforms.NONE, output=None):
-        '''
+        """
         Assert platform is added.
         :param app_name: Application name (folder where app is located).
         :param platform: Platforms that should be available.
         :param output: output of `tns platform add` command
-        '''
+        """
 
         # Verify console output is correct
         if output is not None:
@@ -173,12 +173,12 @@ def platform_added(app_name, platform=Platforms.NONE, output=None):
 
     @staticmethod
     def platform_list_status(output=None, prepared=Platforms.NONE, added=Platforms.NONE):
-        '''
+        """
         Assert platform list status
         :param output: Outout of `tns platform list` command
         :param prepared: Prepared platform.
         :param added: Added platform.
-        '''
+        """
         if output is not None:
             # Assert prepare status
             if prepared is Platforms.NONE:
@@ -246,13 +246,13 @@ def get_tsconfig_json(app_name):
 
     @staticmethod
     def prepared(app_name, platform=Platforms.BOTH, output=None, prepare_type=Prepare.FULL):
-        '''
+        """
         Assert project is prepared properly.
         :param app_name: Application name.
         :param platform: Platform that should be prepared.
         :param output: Output of `tns prepare` platform.
         :param prepare_type: Prepare type (SKIP, INCREMENTAL, FULL, FIRST_TIME)
-        '''
+        """
 
         def _incremental_prepare():
             assert 'Skipping prepare.' not in output
@@ -292,28 +292,26 @@ def _full_prepare():
                 if platform is Platforms.IOS or platform is Platforms.BOTH:
                     assert 'tns-ios' in output
 
-                    # Ignore because of https://github.com/NativeScript/nativescript-cli/issues/2586
-                    # if platform is Platforms.ANDROID or platform is Platforms.BOTH:
-                    #     app_path = app_name + TnsAsserts.PLATFORM_ANDROID_APP_PATH
-                    #     modules_path = app_name + TnsAsserts.PLATFORM_ANDROID_TNS_MODULES_PATH
-                    #     assert File.exists(app_path + 'main-view-model.js'), \
-                    #         'Application files does not exists in platforms folder.'
-                    #     assert File.exists(modules_path + 'application/application.js'), \
-                    #         'Modules does not exists in platforms folder.'
-                    #     assert File.exists(modules_path + 'xml/xml.js'), 'TNS Modules does not exists in platforms folder.'
-                    #     assert not File.exists(modules_path + 'application/application.android.js'), \
-                    #         'Prepare does not strip \'android\' from name of js files.'
-                    #     assert not File.exists(modules_path + 'application/application.ios.js'), \
-                    #         'Prepare does not skip \'ios\' specific js files.'
-                    #
-                    # if platform is Platforms.IOS or platform is Platforms.BOTH:
-                    #     app_path = TnsAsserts._get_ios_app_path(app_name)
-                    #     modules_path = TnsAsserts._get_ios_modules_path(app_name)
-                    #     assert File.exists(app_path + 'main-view-model.js'), \
-                    #         'Application files does not exists in platforms folder.'
-                    #     assert File.exists(modules_path + 'application/application.js'), \
-                    #         'Modules does not exists in platforms folder.'
-                    #     assert not File.exists(modules_path + 'application/application.android.js'), \
-                    #         'Prepare does not skip \'ios\' specific js files.'
-                    #     assert not File.exists(modules_path + 'application/application.ios.js'), \
-                    #         'Prepare does not strip \'ios\' from name of js files.'
+            if platform is Platforms.ANDROID or platform is Platforms.BOTH:
+                app_path = app_name + TnsAsserts.PLATFORM_ANDROID_APP_PATH
+                modules_path = app_name + TnsAsserts.PLATFORM_ANDROID_TNS_MODULES_PATH
+                assert File.exists(app_path + 'main-view-model.js'), \
+                    'Application files does not exists in platforms folder.'
+                assert File.exists(modules_path + 'application/application.js'), \
+                    'Modules does not exists in platforms folder.'
+                assert File.exists(modules_path + 'xml/xml.js'), 'TNS Modules does not exists in platforms folder.'
+                assert not File.exists(modules_path + 'application/application.android.js'), \
+                    'Prepare does not strip \'android\' from name of js files.'
+                assert not File.exists(modules_path + 'application/application.ios.js'), \
+                    'Prepare does not skip \'ios\' specific js files.'
+            if platform is Platforms.IOS or platform is Platforms.BOTH:
+                app_path = TnsAsserts._get_ios_app_path(app_name)
+                modules_path = TnsAsserts._get_ios_modules_path(app_name)
+                assert File.exists(app_path + 'main-view-model.js'), \
+                    'Application files does not exists in platforms folder.'
+                assert File.exists(modules_path + 'application/application.js'), \
+                    'Modules does not exists in platforms folder.'
+                assert not File.exists(modules_path + 'application/application.android.js'), \
+                    'Prepare does not skip \'ios\' specific js files.'
+                assert not File.exists(modules_path + 'application/application.ios.js'), \
+                    'Prepare does not strip \'ios\' from name of js files.'

tests/build/PlatformAndroid_Tests.py

@@ -2,7 +2,6 @@
 Test platform add (android)
 """
 import os
-import unittest
 
 from core.base_class.BaseClass import BaseClass
 from core.osutils.file import File
@@ -72,7 +71,6 @@ def test_210_platform_update_android_when_platform_not_added(self):
                                      assert_success=False)
         TnsAsserts.platform_added(self.app_name, platform=Platforms.ANDROID, output=output)
 
-    @unittest.skip("Ignored because of https://github.com/NativeScript/nativescript-cli/issues/2588")
     def test_300_set_sdk(self):
         """Platform add android should be able to specify target sdk with `--sdk` option"""
         Tns.create_app(self.app_name, update_modules=False)
@@ -83,7 +81,6 @@ def test_300_set_sdk(self):
         assert "android:minSdkVersion=\"17\"" in output
         assert "android:targetSdkVersion=\"19\"" in output
 
-    @unittest.skip("Ignored because of https://github.com/NativeScript/nativescript-cli/issues/2588")
     def test_310_set_sdk_not_installed(self):
         Tns.create_app(self.app_name, update_modules=False)
         output = Tns.platform_add_android(attributes={"--path": self.app_name,
@@ -148,7 +145,6 @@ def test_421_platform_add_android_wrong_option(self):
         assert no_platform in output
         assert "Usage" in output
 
-    @unittest.skip("Ignored because of https://github.com/NativeScript/nativescript-cli/issues/2587")
     def test_430_platform_remove_missing_invalid_or_empty_platform(self):
         Tns.create_app(self.app_name, update_modules=False)
 

tests/build/PrepareAndroid_Tests.py

@@ -3,7 +3,6 @@
 """
 import os
 import time
-import unittest
 
 from core.base_class.BaseClass import BaseClass
 from core.osutils.command import run
@@ -135,7 +134,6 @@ def test_310_prepare_should_flatten_scoped_dependencies(self):
         ng_path_in_platforms_folder = self.app_name + TnsAsserts.PLATFORM_ANDROID_NPM_MODULES_PATH + '@angular/core'
         assert File.exists(ng_path_in_platforms_folder), "Scoped dependencies are flattened, please see #1783!"
 
-    @unittest.skip("Ignored because of https://github.com/NativeScript/nativescript-cli/issues/2587")
     def test_400_prepare_missing_or_missing_platform(self):
         Tns.create_app(self.app_name, update_modules=False)
 

tests/run/emulator/EmulateAndroidTests.py

@@ -3,21 +3,14 @@
 """
 import os
 
-# C0103 - Invalid %s name "%s"
-# C0111 - Missing docstring
-# R0201 - Method could be a function
-# R0904 - Too many public methods
-# pylint: disable=C0103, C0111, R0201, R0904
-import unittest
-
 from core.base_class.BaseClass import BaseClass
 from core.device.device import Device
 from core.device.emulator import Emulator
 from core.osutils.folder import Folder
 from core.settings.settings import ANDROID_RUNTIME_PATH, TNS_PATH, ANDROID_KEYSTORE_PATH, ANDROID_KEYSTORE_PASS, \
     ANDROID_KEYSTORE_ALIAS, ANDROID_KEYSTORE_ALIAS_PASS, EMULATOR_ID
-from core.tns.tns import Tns
 from core.settings.strings import *
+from core.tns.tns import Tns
 
 
 class EmulateAndroidTests(BaseClass):
@@ -66,7 +59,6 @@ def test_001_emulate_android_in_running_emulator(self):
         Device.is_running(app_id="org.nativescript.TNSApp", device_id=EMULATOR_ID), \
         "Application is not running on {0}".format(EMULATOR_ID)
 
-    @unittest.skip("Ignored because of https://github.com/NativeScript/nativescript-cli/issues/2589")
     def test_002_emulate_android_release(self):
         output = Tns.run_tns_command("emulate android", attributes={  # "--device": EMULATOR_NAME,
             "--keyStorePath": ANDROID_KEYSTORE_PATH,
@@ -95,7 +87,7 @@ def test_200_emulate_android_inside_project(self):
         },
                                      tns_path=os.path.join("..", TNS_PATH), timeout=660)
         os.chdir(current_dir)
-        # assert successfully_prepared in output (remove the comment after test_002_emulate_android_release is enabled)
+        assert successfully_prepared in output
         assert successfully_built in output
         assert "Starting Android emulator with image" not in output
         assert installed_on_device.format(EMULATOR_ID) in output

tests/run/emulator/RunAndroidTests.py

@@ -17,7 +17,6 @@
 from core.tns.tns import Tns
 
 
-@unittest.skip("Ignored because of https://github.com/NativeScript/nativescript-cli/issues/2590")
 class RunAndroidTests(BaseClass):
     @classmethod
     def setUpClass(cls):