From ce0ec177160fc797523947f10faa8233ad3150f3 Mon Sep 17 00:00:00 2001 From: Natalia-Hristova Date: Mon, 26 Aug 2019 18:52:47 +0300 Subject: [PATCH] fix: update logs - CLI changes --- tests/runtimes/android/android_runtime_tests.py | 16 ++++++++-------- tests/runtimes/ios/ios_runtime_tests.py | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/runtimes/android/android_runtime_tests.py b/tests/runtimes/android/android_runtime_tests.py index 8c17124b..ca7d4a11 100644 --- a/tests/runtimes/android/android_runtime_tests.py +++ b/tests/runtimes/android/android_runtime_tests.py @@ -167,10 +167,10 @@ def test_317_check_native_crash_will_not_crash_when_discardUncaughtJsExceptions_ Device.click(self.emulator, "TAP", True) if self.emulator.version == 6.0: stack_trace_first_part = r"""### Stack Trace Start -JS: viewModel\.onTapfile:///app/main-view-model\.js:\d+:\d+ -JS: at push\.\.\./node_modules/tns-core-modules/data/observable/observable\.js\.Observable\.notifyfile:///node_modules/tns-core-modules/data/observable/observable\.js:\d+:\d+ -JS: at push\.\.\./node_modules/tns-core-modules/data/observable/observable\.js\.Observable\._emitfile:///node_modules/tns-core-modules/data/observable/observable\.js:\d+:\d+ -JS: at ClickListenerImpl\.onClickfile:///node_modules/tns-core-modules/ui/button/button\.js:\d+:\d+ +JS: viewModel\.onTap\(file:\/\/\/app\/main-view-model\.js:\d+:\d+\) +JS: at push\.\.\.\/node_modules\/tns-core-modules\/data\/observable\/observable\.js\.Observable\.notify\(file:\/\/\/node_modules\/tns-core-modules\/data\/observable\/observable\.js:\d+:\d+\) +JS: at push\.\.\.\/node_modules\/tns-core-modules\/data\/observable\/observable\.js\.Observable\._emit\(file:\/\/\/node_modules\/tns-core-modules\/data\/observable\/observable\.js:\d+:\d+\) +JS: at ClickListenerImpl\.onClick\(file:\/\/\/node_modules\/tns-core-modules\/ui\/button\/button\.js:\d+:\d+\) JS: at com\.tns\.Runtime\.callJSMethodNative\(Native Method\) JS: at com\.tns\.Runtime\.dispatchCallJSMethodNative\(Runtime\.java:\d+\) JS: at com\.tns\.Runtime\.callJSMethodImpl\(Runtime\.java:\d+\) @@ -193,10 +193,10 @@ def test_317_check_native_crash_will_not_crash_when_discardUncaughtJsExceptions_ JS: ### Stack Trace End""" # noqa: E501 else: stack_trace_first_part = r"""### Stack Trace Start -JS: viewModel\.onTapfile:///app/main-view-model\.js:\d+:\d+ -JS: at push\.\.\./node_modules/tns-core-modules/data/observable/observable\.js\.Observable\.notifyfile:///node_modules/tns-core-modules/data/observable/observable\.js:\d+:\d+ -JS: at push\.\.\./node_modules/tns-core-modules/data/observable/observable\.js\.Observable\._emitfile:///node_modules/tns-core-modules/data/observable/observable\.js:\d+:\d+ -JS: at ClickListenerImpl\.onClickfile:///node_modules/tns-core-modules/ui/button/button\.js:\d+:\d+ +JS: viewModel\.onTap\(file:\/\/\/app\/main-view-model\.js:\d+:\d+\) +JS: at push\.\.\.\/node_modules\/tns-core-modules\/data\/observable\/observable\.js\.Observable\.notify\(file:\/\/\/node_modules\/tns-core-modules\/data\/observable\/observable\.js:\d+:\d+\) +JS: at push\.\.\.\/node_modules\/tns-core-modules\/data\/observable\/observable\.js\.Observable\._emit\(file:\/\/\/node_modules\/tns-core-modules\/data\/observable\/observable\.js:\d+:\d+\) +JS: at ClickListenerImpl\.onClick\(file:\/\/\/node_modules\/tns-core-modules\/ui\/button\/button\.js:\d+:\d+\) JS: at com\.tns\.Runtime\.callJSMethodNative\(Native Method\) JS: at com\.tns\.Runtime\.dispatchCallJSMethodNative\(Runtime\.java:\d+\) JS: at com\.tns\.Runtime\.callJSMethodImpl\(Runtime\.java:\d+\) diff --git a/tests/runtimes/ios/ios_runtime_tests.py b/tests/runtimes/ios/ios_runtime_tests.py index a63c3a56..7f1f12ee 100644 --- a/tests/runtimes/ios/ios_runtime_tests.py +++ b/tests/runtimes/ios/ios_runtime_tests.py @@ -147,8 +147,8 @@ def test_386_check_native_crash_will_not_crash_when_discardUncaughtJsExceptions_ log = Tns.run_ios(app_name=APP_NAME, emulator=True) - strings = ['CONSOLE LOG file:///app/app.js:47:0 The folder “not-existing-path” doesn’t exist.', - 'JS:\ncontentsOfDirectoryAtPathError(file:///app/main-view-model.js:6:0'] + strings = ['CONSOLE LOG file:///app/app.js:47:0: The folder “not-existing-path” doesn’t exist.', + 'JS:\ncontentsOfDirectoryAtPathError(file:///app/main-view-model.js:6:0)'] test_result = Wait.until(lambda: all(string in File.read(log.log_file) for string in strings), timeout=300, period=5)