diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-20 13:40:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-22 12:41:23 +0000 |
| commit | 7961cea6d1041e3e454dae6a1da660b453efd238 (patch) | |
| tree | c0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/build/android/pylib/local/device | |
| parent | b7034d0803538058e5c9d904ef03cf5eab34f6ef (diff) | |
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/build/android/pylib/local/device')
| -rw-r--r-- | chromium/build/android/pylib/local/device/local_device_instrumentation_test_run.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/chromium/build/android/pylib/local/device/local_device_instrumentation_test_run.py b/chromium/build/android/pylib/local/device/local_device_instrumentation_test_run.py index e3a74934b11..18914e9aa13 100644 --- a/chromium/build/android/pylib/local/device/local_device_instrumentation_test_run.py +++ b/chromium/build/android/pylib/local/device/local_device_instrumentation_test_run.py @@ -79,6 +79,9 @@ EXTRA_TRACE_FILE = ('org.chromium.base.test.BaseJUnit4ClassRunner.TraceFile') _EXTRA_TEST_LIST = ( 'org.chromium.base.test.BaseChromiumAndroidJUnitRunner.TestList') +_EXTRA_PACKAGE_UNDER_TEST = ('org.chromium.chrome.test.pagecontroller.rules.' + 'ChromeUiApplicationTestRule.PackageUnderTest') + FEATURE_ANNOTATION = 'Feature' RENDER_TEST_FEATURE_ANNOTATION = 'RenderTest' @@ -395,9 +398,8 @@ class LocalDeviceInstrumentationTestRun( if self._test_instance.package_info: cmdline_file = self._test_instance.package_info.cmdline_file else: - logging.warning( - 'No PackageInfo found, falling back to using flag file %s', - cmdline_file) + raise Exception('No PackageInfo found but' + '--use-apk-under-test-flags-file is specified.') self._flag_changers[str(device)] = flag_changer.FlagChanger( device, cmdline_file) @@ -425,6 +427,11 @@ class LocalDeviceInstrumentationTestRun( def _RunTest(self, device, test): extras = {} + # Provide package name under test for apk_under_test. + if self._test_instance.apk_under_test: + package_name = self._test_instance.apk_under_test.GetPackageName() + extras[_EXTRA_PACKAGE_UNDER_TEST] = package_name + flags_to_add = [] test_timeout_scale = None if self._test_instance.coverage_directory: @@ -582,7 +589,7 @@ class LocalDeviceInstrumentationTestRun( def handle_coverage_data(): if self._test_instance.coverage_directory: try: - device.PullFile(coverage_directory, + device.PullFile(coverage_device_file, self._test_instance.coverage_directory) device.RunShellCommand( 'rm -f %s' % posixpath.join(coverage_directory, '*'), |