| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import collections | 5 import collections |
| 6 import copy | 6 import copy |
| 7 import logging | 7 import logging |
| 8 import os | 8 import os |
| 9 import pickle | 9 import pickle |
| 10 import re | 10 import re |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 # Ref: http://developer.android.com/reference/android/app/Activity.html | 26 # Ref: http://developer.android.com/reference/android/app/Activity.html |
| 27 _ACTIVITY_RESULT_CANCELED = 0 | 27 _ACTIVITY_RESULT_CANCELED = 0 |
| 28 _ACTIVITY_RESULT_OK = -1 | 28 _ACTIVITY_RESULT_OK = -1 |
| 29 | 29 |
| 30 _COMMAND_LINE_PARAMETER = 'cmdlinearg-parameter' | 30 _COMMAND_LINE_PARAMETER = 'cmdlinearg-parameter' |
| 31 _DEFAULT_ANNOTATIONS = [ | 31 _DEFAULT_ANNOTATIONS = [ |
| 32 'Smoke', 'SmallTest', 'MediumTest', 'LargeTest', | 32 'Smoke', 'SmallTest', 'MediumTest', 'LargeTest', |
| 33 'EnormousTest', 'IntegrationTest'] | 33 'EnormousTest', 'IntegrationTest'] |
| 34 _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS = [ | 34 _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS = [ |
| 35 'DisabledTest', 'FlakyTest'] | 35 'DisabledTest', 'FlakyTest'] |
| 36 _EXTRA_ENABLE_HTTP_SERVER = ( | |
| 37 'org.chromium.chrome.test.ChromeInstrumentationTestRunner.' | |
| 38 + 'EnableTestHttpServer') | |
| 39 _EXTRA_DRIVER_TEST_LIST = ( | 36 _EXTRA_DRIVER_TEST_LIST = ( |
| 40 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestList') | 37 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestList') |
| 41 _EXTRA_DRIVER_TEST_LIST_FILE = ( | 38 _EXTRA_DRIVER_TEST_LIST_FILE = ( |
| 42 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestListFile') | 39 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestListFile') |
| 43 _EXTRA_DRIVER_TARGET_PACKAGE = ( | 40 _EXTRA_DRIVER_TARGET_PACKAGE = ( |
| 44 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TargetPackage') | 41 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TargetPackage') |
| 45 _EXTRA_DRIVER_TARGET_CLASS = ( | 42 _EXTRA_DRIVER_TARGET_CLASS = ( |
| 46 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TargetClass') | 43 'org.chromium.test.driver.OnDeviceInstrumentationDriver.TargetClass') |
| 47 _PARAMETERIZED_TEST_ANNOTATION = 'ParameterizedTest' | 44 _PARAMETERIZED_TEST_ANNOTATION = 'ParameterizedTest' |
| 48 _PARAMETERIZED_TEST_SET_ANNOTATION = 'ParameterizedTest$Set' | 45 _PARAMETERIZED_TEST_SET_ANNOTATION = 'ParameterizedTest$Set' |
| (...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 588 for t in tests: | 585 for t in tests: |
| 589 parameters = ParseCommandLineFlagParameters(t['annotations']) | 586 parameters = ParseCommandLineFlagParameters(t['annotations']) |
| 590 if parameters: | 587 if parameters: |
| 591 t['flags'] = parameters[0] | 588 t['flags'] = parameters[0] |
| 592 for p in parameters[1:]: | 589 for p in parameters[1:]: |
| 593 parameterized_t = copy.copy(t) | 590 parameterized_t = copy.copy(t) |
| 594 parameterized_t['flags'] = p | 591 parameterized_t['flags'] = p |
| 595 new_tests.append(parameterized_t) | 592 new_tests.append(parameterized_t) |
| 596 return tests + new_tests | 593 return tests + new_tests |
| 597 | 594 |
| 598 @staticmethod | |
| 599 def GetHttpServerEnvironmentVars(): | |
| 600 return { | |
| 601 _EXTRA_ENABLE_HTTP_SERVER: None, | |
| 602 } | |
| 603 | |
| 604 def GetDriverEnvironmentVars( | 595 def GetDriverEnvironmentVars( |
| 605 self, test_list=None, test_list_file_path=None): | 596 self, test_list=None, test_list_file_path=None): |
| 606 env = { | 597 env = { |
| 607 _EXTRA_DRIVER_TARGET_PACKAGE: self.test_package, | 598 _EXTRA_DRIVER_TARGET_PACKAGE: self.test_package, |
| 608 _EXTRA_DRIVER_TARGET_CLASS: self.test_runner, | 599 _EXTRA_DRIVER_TARGET_CLASS: self.test_runner, |
| 609 } | 600 } |
| 610 | 601 |
| 611 if test_list: | 602 if test_list: |
| 612 env[_EXTRA_DRIVER_TEST_LIST] = ','.join(test_list) | 603 env[_EXTRA_DRIVER_TEST_LIST] = ','.join(test_list) |
| 613 | 604 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 625 def GenerateTestResults( | 616 def GenerateTestResults( |
| 626 result_code, result_bundle, statuses, start_ms, duration_ms): | 617 result_code, result_bundle, statuses, start_ms, duration_ms): |
| 627 return GenerateTestResults(result_code, result_bundle, statuses, | 618 return GenerateTestResults(result_code, result_bundle, statuses, |
| 628 start_ms, duration_ms) | 619 start_ms, duration_ms) |
| 629 | 620 |
| 630 #override | 621 #override |
| 631 def TearDown(self): | 622 def TearDown(self): |
| 632 if self._isolate_delegate: | 623 if self._isolate_delegate: |
| 633 self._isolate_delegate.Clear() | 624 self._isolate_delegate.Clear() |
| 634 | 625 |
| OLD | NEW |