Merge pull request #360 from NativeScript/no-snapshot-on-catalina

chore: do not build with snapshot on catalina

Author: dtopuzov

core/utils/os_utils.py

@@ -0,0 +1,25 @@
+import platform
+
+from core.enums.os_type import OSType
+from core.settings.Settings import HOST_OS
+from core.utils.version import Version
+
+
+class OSUtils(object):
+    @staticmethod
+    def get_version():
+        """
+        Get OS version
+        :return: Version as double.
+        """
+        result = platform.release()
+        version_string = ".".join(result.split(".", 2)[:2])
+        return Version.get(version_string)
+
+    @staticmethod
+    def is_catalina():
+        """
+        Check if current os is macOS Catalina.
+        :return: True if host OS is Catalina.
+        """
+        return HOST_OS is OSType.OSX and OSUtils.get_version() >= 19.0

tests/cli/build/android_app_bundle_tests.py

@@ -1,20 +1,19 @@
 import os
 import unittest
-import platform
 
-from core.enums.os_type import OSType
-from core.utils.file_utils import Folder, File
-from core.utils.device.adb import Adb
-from core.utils.run import run
 from core.base_test.tns_run_test import TnsRunTest
+from core.enums.os_type import OSType
 from core.settings import Settings
 from core.settings.Settings import TEST_SUT_HOME, TEST_RUN_HOME, AppName, Android
+from core.utils.device.adb import Adb
+from core.utils.file_utils import Folder, File
+from core.utils.os_utils import OSUtils
+from core.utils.run import run
 from data.templates import Template
 from products.nativescript.tns import Tns
 
 
 class AndroidAppBundleTests(TnsRunTest):
-
     app_name = AppName.DEFAULT
     app_path = os.path.join(TEST_RUN_HOME, app_name)
     target_project_dir = os.path.join(TEST_RUN_HOME, 'data', 'temp', app_name)
@@ -89,7 +88,7 @@ def test_200_build_android_app_bundle(self):
         self.emu.wait_for_text(text='TAP')
 
     @unittest.skipIf(Settings.HOST_OS == OSType.WINDOWS, "Skip on Windows")
-    @unittest.skipIf(platform.platform() == 'Darwin-19.0.0-x86_64-i386-64bit', 'snapshot not working on Catalina')
+    @unittest.skipIf(OSUtils.is_catalina(), 'snapshot not working on Catalina')
     def test_205_build_android_app_bundle_env_snapshot(self):
         """Build app with android app bundle option with --bundle and optimisations for snapshot.
            Verify the output(app.aab) and use bundletool to deploy on device."""

tests/cli/build/build_tests.py

@@ -1,5 +1,4 @@
 import os
-import platform
 import unittest
 
 from core.base_test.tns_test import TnsTest
@@ -9,11 +8,12 @@
 from core.settings.Settings import TEST_RUN_HOME
 from core.utils.file_utils import File, Folder
 from core.utils.npm import Npm
+from core.utils.os_utils import OSUtils
 from core.utils.run import run
 from data.templates import Template
 from products.nativescript.tns import Tns
-from products.nativescript.tns_paths import TnsPaths
 from products.nativescript.tns_assert import TnsAssert
+from products.nativescript.tns_paths import TnsPaths
 
 
 class BuildTests(TnsTest):
@@ -93,7 +93,7 @@ def test_001_build_android(self):
         assert "Gradle build..." in result.output, "Gradle build is not called."
         assert result.output.count("Gradle build...") == 1, "More than 1 gradle build is triggered."
 
-    @unittest.skipIf(platform.platform() == 'Darwin-19.0.0-x86_64-i386-64bit', 'snapshot not working on Catalina')
+    @unittest.skipIf(OSUtils.is_catalina(), 'snapshot not working on Catalina')
     def test_002_build_android_release_uglify_snapshot_sourcemap(self):
         # https://github.com/NativeScript/nativescript-dev-webpack/issues/920
         result = Tns.build_android(self.app_name, release=True, uglify=True, snapshot=True, source_map=True)

tests/code_sharing/ng_new_tests.py

@@ -14,6 +14,7 @@
 from core.settings import Settings
 from core.utils.file_utils import Folder
 from core.utils.json_utils import JsonUtils
+from core.utils.os_utils import OSUtils
 from data.apps import Apps
 from data.const import Colors
 from products.angular.ng import NG, NS_SCHEMATICS
@@ -177,8 +178,10 @@ def run_bundle(app_data, webpack, shared, theme, emu, sim):
 
     @staticmethod
     def build_release():
+        # Do not build with snapshot on macOS Catalina due to known issue.
+        snapshot = not OSUtils.is_catalina()
         Tns.build(app_name=NGNewTests.app_name, platform=Platform.ANDROID, release=True,
-                  bundle=True, aot=True, uglify=True, snapshot=True)
+                  bundle=True, aot=True, uglify=True, snapshot=snapshot)
         if Settings.HOST_OS is OSType.OSX:
             Tns.build(app_name=NGNewTests.app_name, platform=Platform.IOS, release=True, for_device=True,
                       bundle=True, aot=True, uglify=True)