Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions tests/perf/start_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from core.device.simulator import Simulator
from core.git.git import Git
from core.npm.npm import Npm
from core.osutils.command_log_level import CommandLogLevel
from core.osutils.file import File
from core.osutils.folder import Folder
from core.settings.settings import ANDROID_PACKAGE, TYPESCRIPT_PACKAGE, WEBPACK_PACKAGE, ANDROID_KEYSTORE_PATH, \
Expand Down Expand Up @@ -100,6 +101,12 @@ def run_perfs(self, perf_loop, app_id, apk, type_of_run):
Adb.start_app(device_id=self.DEVICE_ID, app_id=app_id)
sleep(5)
Device.wait_until_app_is_running(device_id=self.DEVICE_ID, app_id=app_id, timeout=10)
if "timeline" in apk and "actual" in type_of_run:
command = 'logcat -d | grep \'Timeline: Modules: Displayed\''
output = Adb.run(command=command, device_id=self.DEVICE_ID, log_level=CommandLogLevel.SILENT)
assert 'Timeline: Modules: Displayed' in output, \
"Timeline is not working! Log: " + output
print "Timeline is working! Log:" + output
current_start_time = int(Device.get_start_time(self.DEVICE_ID, app_id=app_id))
start_time = start_time + current_start_time

Expand All @@ -114,6 +121,12 @@ def run_perfs(self, perf_loop, app_id, apk, type_of_run):
Adb.start_app(device_id=self.DEVICE_ID, app_id=app_id)
sleep(5)
Device.wait_until_app_is_running(device_id=self.DEVICE_ID, app_id=app_id, timeout=10)
if "timeline" in apk and "actual" in type_of_run:
command = 'logcat -d | grep \'Timeline: Modules: Displayed\''
output = Adb.run(command=command, device_id=self.DEVICE_ID, log_level=CommandLogLevel.SILENT)
assert 'Timeline: Modules: Displayed' in output, \
"Timeline is not working! Log: " + output
print "Timeline is working! Log:" + output
current_second_start_time = int(Device.get_start_time(self.DEVICE_ID, app_id=app_id))
second_start = second_start + current_second_start_time

Expand Down Expand Up @@ -188,12 +201,28 @@ def test_prepare_android(self, demo, config, device_name, device_id, first_start

Tns.build_android(attributes=attributes)
apk = Helpers.get_apk_path(app_name=self.app_name, config='release')
destination = os.path.join(TEST_RUN_HOME, "{0}-{1}.apk".format(demo.split('/')[-1], config))
destination_info = os.path.join(TEST_RUN_HOME, "{0}-{1}.txt".format(demo.split('/')[-1], config))
if "timeline" in config:
destination = os.path.join(TEST_RUN_HOME, "release-apps", "{0}-{1}.apk".format(demo.split('/')[-1], config))
destination_info = os.path.join(TEST_RUN_HOME, "release-apps",
"{0}-{1}.txt".format(demo.split('/')[-1], config))
else:
destination = os.path.join(TEST_RUN_HOME, "{0}-{1}.apk".format(demo.split('/')[-1], config))
destination_info = os.path.join(TEST_RUN_HOME, "{0}-{1}.txt".format(demo.split('/')[-1], config))
File.remove(destination)
File.remove(destination_info)
File.copy(src=apk, dest=destination)
File.write(file_path=destination_info, text=Tns.get_app_id(self.app_name))
if "timeline" in config:
package_json = os.path.join(self.app_name, 'app', 'package.json')
File.replace(package_json, "\"main\": \"main.js\"", "\"main\": \"main.js\",\"profiling\": \"timeline\"")
Tns.build_android(attributes=attributes)
apk = Helpers.get_apk_path(app_name=self.app_name, config='release')
destination = os.path.join(TEST_RUN_HOME, "{0}-{1}.apk".format(demo.split('/')[-1], config))
destination_info = os.path.join(TEST_RUN_HOME, "{0}-{1}.txt".format(demo.split('/')[-1], config))
File.remove(destination)
File.remove(destination_info)
File.copy(src=apk, dest=destination)
File.write(file_path=destination_info, text=Tns.get_app_id(self.app_name))

@parameterized.expand(DATA)
def test_start_time(self, demo, config, device_name, device_id, first_start, second_start):
Expand Down
4 changes: 3 additions & 1 deletion tests/perf/values.csv
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ NativeScript/nativescript-sdk-examples-ng,webpack-snapshot,Pixel2,FA7B71A00082,1
NativeScript/sample-Groceries,default,Pixel2,FA7B71A00082,4248,2501
NativeScript/sample-Groceries,webpack,Pixel2,FA7B71A00082,1932,1880
NativeScript/sample-Groceries,webpack-snapshot,Pixel2,FA7B71A00082,1477,1368
NativeScript/sample-Groceries,timeline,Pixel2,FA7B71A00082,4248,2501
NativeScript/template-hello-world,default,Nexus5x,016d37cd3fe7c676,1897,1504
NativeScript/template-hello-world,webpack,Nexus5x,016d37cd3fe7c676,1693,1523
NativeScript/template-hello-world,webpack-snapshot,Nexus5x,016d37cd3fe7c676,1335,1119
Expand All @@ -24,4 +25,5 @@ NativeScript/nativescript-sdk-examples-ng,webpack,Nexus5x,016d37cd3fe7c676,3218,
NativeScript/nativescript-sdk-examples-ng,webpack-snapshot,Nexus5x,016d37cd3fe7c676,2561,2077
NativeScript/sample-Groceries,default,Nexus5x,016d37cd3fe7c676,6348,4017
NativeScript/sample-Groceries,webpack,Nexus5x,016d37cd3fe7c676,3218,3095
NativeScript/sample-Groceries,webpack-snapshot,Nexus5x,016d37cd3fe7c676,2561,2113
NativeScript/sample-Groceries,webpack-snapshot,Nexus5x,016d37cd3fe7c676,2561,2113
NativeScript/sample-Groceries,timeline,Nexus5x,016d37cd3fe7c676,6348,4017