console logs

Author: miroslavaivanova

core/utils/device/device.py

@@ -26,17 +26,21 @@ def __init__(self, id, name, type, model, version):
         self.type = type
         self.version = version
         self.model = model
+        self.name = name
 
         if type is DeviceType.IOS:
             type = run(cmd="ideviceinfo | grep ProductType").output
             type = type.replace(',', '')
             type = type.replace('ProductType:', '').strip(' ')
             self.name = type
-            self.model = type
-        if type is DeviceType.ANDROID:
-            self.name = name
-            model = run(cmd="adb shell getprop ro.product.model").output
+        if type is DeviceType.SIM:
+            self.model = name
+        if type is DeviceType.EMU:
+            cmd = 'shell getprop ro.product.model'
+            model = Adb.run_adb_command(command=cmd, wait=True).output
             self.model= model
+        else:
+            self.name = name
 
         if type is DeviceType.SIM:
             self.device_log_file = Simctl.get_log_file(self.id)

data/sync/hello_world_js.py

@@ -191,7 +191,7 @@ def preview_sync_hello_world_js_ts(app_type, app_name, platform, device, bundle=
 
     # Edit CSS file and verify changes are applied
     Sync.replace(app_name=app_name, change_set=css_change)
-    strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle,
+    strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle, device=device,
                                                     hmr=hmr, file_name='app.css', instrumented=instrumented)
     if hmr and instrumented and Settings.HOST_OS != OSType.WINDOWS:
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings,
@@ -202,7 +202,7 @@ def preview_sync_hello_world_js_ts(app_type, app_name, platform, device, bundle=
 
     # Edit JS file and verify changes are applied
     Sync.replace(app_name=app_name, change_set=js_change)
-    strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle, hmr=hmr,
+    strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle, hmr=hmr, device=device,
                                                     file_name=js_file, instrumented=instrumented)
     if hmr and instrumented and Settings.HOST_OS != OSType.WINDOWS:
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings,
@@ -213,7 +213,7 @@ def preview_sync_hello_world_js_ts(app_type, app_name, platform, device, bundle=
 
     # Edit XML file and verify changes are applied
     Sync.replace(app_name=app_name, change_set=xml_change)
-    strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle,
+    strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle, device=device,
                                                     hmr=hmr, file_name='main-page.xml', instrumented=instrumented)
     if hmr and instrumented and Settings.HOST_OS != OSType.WINDOWS:
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings,

products/nativescript/tns_logs.py

@@ -246,25 +246,25 @@ def __webpack_messages():
                 'Webpack build done!']
 
     @staticmethod
-    def preview_initial_messages(platform, device, bundle=True, hmr=False, instrumented=False):
-        logs = ['Start sending initial files for platform {0}'.format(str(device.model)),
-                'Successfully sent initial files for platform {0}'.format(str(device.model))]
+    def preview_initial_messages(device, bundle=True, hmr=False, instrumented=False):
+        logs = ["Start sending initial files for device \'{0}\'".format(str(device.model)),
+                "Successfully sent initial files for device \'{0}\'".format(str(device.model))]
         if bundle or hmr:
             logs.extend(TnsLogs.__webpack_messages())
         if instrumented:
             logs.append('QA: Application started')
         return logs
 
     @staticmethod
-    def preview_file_changed_messages(platform, device, file_name, run_type=RunType.INCREMENTAL,
+    def preview_file_changed_messages(device, file_name, run_type=RunType.INCREMENTAL,
                                       bundle=True, hmr=True, instrumented=False):
-        logs = ['Start syncing changes for platform {0}'.format(str(platform))]
+        logs = ["Start syncing changes for device \'{0}\'".format(str(device.model))]
         if bundle or hmr:
             logs.extend(TnsLogs.__webpack_messages())
             logs.append(file_name)
         else:
             logs.append('Successfully synced')
-            logs.append('{0} for platform {1}'.format(file_name.replace('.ts', '.js'), str(platform)))
+            logs.append('{0} for device {1}'.format(file_name.replace('.ts', '.js'), str(device.model)))
         if hmr:
             logs.append('hot-update.json')
             logs.append('HMR: Checking for updates to the bundle with hmr hash')

tests/cli/preview/templates/hello_word_js_tests.py

@@ -31,7 +31,7 @@ def setUpClass(cls):
         cls.emu_API24 = DeviceManager.Emulator.ensure_available(Settings.Emulators.EMU_API_24)
 
         # Download Preview and Playground packages
-        # Preview.get_app_packages()
+        Preview.get_app_packages()
 
         # Install Preview and Playground
         Preview.install_preview_app(cls.emu, Platform.ANDROID)