console logs

Author: miroslavaivanova

core/utils/device/device.py

@@ -21,18 +21,22 @@
 
 class Device(object):
     # noinspection PyShadowingBuiltins
-    def __init__(self, id, name, type, version):
+    def __init__(self, id, name, type, model, version):
         self.id = id
         self.type = type
         self.version = version
+        self.model = model
 
         if type is DeviceType.IOS:
             type = run(cmd="ideviceinfo | grep ProductType").output
             type = type.replace(',', '')
             type = type.replace('ProductType:', '').strip(' ')
             self.name = type
-        else:
+            self.model = type
+        if type is DeviceType.ANDROID:
             self.name = name
+            model = run(cmd="adb shell getprop ro.product.model").output
+            self.model= model
 
         if type is DeviceType.SIM:
             self.device_log_file = Simctl.get_log_file(self.id)

core/utils/device/device_manager.py

@@ -83,7 +83,8 @@ def start(emulator):
             booted = Adb.wait_until_boot(device_id=emulator.emu_id)
             if booted:
                 Log.info('{0} is up and running!'.format(emulator.avd))
-                device = Device(id=emulator.emu_id, name=emulator.avd, type=DeviceType.EMU, version=emulator.os_version)
+                device = Device(id=emulator.emu_id, model=emulator.model, name=emulator.avd, type=DeviceType.EMU,
+                                version=emulator.os_version)
                 TestContext.STARTED_DEVICES.append(device)
                 return device
             else:
@@ -169,7 +170,7 @@ def start(simulator_info):
 
             # Return result
             device = Device(id=simulator_info.id, name=simulator_info.name, type=DeviceType.SIM,
-                            version=simulator_info.sdk)
+                            version=simulator_info.sdk, model=simulator_info.id)
             TestContext.STARTED_DEVICES.append(device)
             return device
 

core/utils/device/emulator_info.py

@@ -1,7 +1,8 @@
 # noinspection PyShadowingBuiltins
 class EmulatorInfo(object):
-    def __init__(self, avd=None, os_version=None, port=None, emu_id=None):
+    def __init__(self, avd=None, os_version=None, port=None, emu_id=None, model=None):
         self.avd = avd
         self.os_version = os_version
         self.port = port
         self.emu_id = emu_id
+        self.model = model

products/nativescript/preview_helpers.py

@@ -143,7 +143,8 @@ def run_app(app_name, platform, device, bundle=True, hmr=True, instrumented=Fals
                     device.click("Open")
 
         # Verify logs
-        strings = TnsLogs.preview_initial_messages(platform=platform, hmr=hmr, bundle=bundle, instrumented=instrumented)
+        strings = TnsLogs.preview_initial_messages(platform=platform, device=device, hmr=hmr, bundle=bundle,
+                                                   instrumented=instrumented)
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, timeout=200)
         return result
 

products/nativescript/tns_logs.py

@@ -246,17 +246,17 @@ def __webpack_messages():
                 'Webpack build done!']
 
     @staticmethod
-    def preview_initial_messages(platform, bundle=True, hmr=False, instrumented=False):
-        logs = ['Start sending initial files for platform {0}'.format(str(platform)),
-                'Successfully sent initial files for platform {0}'.format(str(platform))]
+    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))]
         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, file_name, run_type=RunType.INCREMENTAL,
+    def preview_file_changed_messages(platform, device, file_name, run_type=RunType.INCREMENTAL,
                                       bundle=True, hmr=True, instrumented=False):
         logs = ['Start syncing changes for platform {0}'.format(str(platform))]
         if bundle or hmr:

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)