diff options
| -rwxr-xr-x | build/android/buildbot/bb_device_steps.py | 4 | ||||
| -rw-r--r-- | build/android/pylib/base/test_result.py | 9 | ||||
| -rw-r--r-- | build/android/pylib/constants.py | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py index b5d8310..d512a85 100755 --- a/build/android/buildbot/bb_device_steps.py +++ b/build/android/buildbot/bb_device_steps.py @@ -169,8 +169,8 @@ def RunInstrumentationSuite(options, test): if options.asan: args.append('--tool=asan') if options.upload_to_flakiness_server: - args.append('--flakiness-dashboard-server=' - 'chrome-android-staging-results.appspot.com') + args.append('--flakiness-dashboard-server=%s' % + constants.UPSTREAM_FLAKINESS_SERVER) RunCmd(['build/android/run_instrumentation_tests.py'] + args) diff --git a/build/android/pylib/base/test_result.py b/build/android/pylib/base/test_result.py index 772d3d5..ee2421e 100644 --- a/build/android/pylib/base/test_result.py +++ b/build/android/pylib/base/test_result.py @@ -15,9 +15,6 @@ from pylib import constants from pylib.utils import flakiness_dashboard_results_uploader -_STAGING_SERVER = 'chrome-android-staging' - - class BaseTestResult(object): """A single result from a unit test.""" @@ -188,15 +185,13 @@ class TestResults(object): return try: - # TODO(frankf): Temp server for initial testing upstream. - # Use http://test-results.appspot.com once we're confident this works. - if _STAGING_SERVER in flakiness_server: + if flakiness_server == constants.UPSTREAM_FLAKINESS_SERVER: assert test_package in ['ContentShellTest', 'ChromiumTestShellTest', 'AndroidWebViewTest'] dashboard_test_type = ('%s_instrumentation_tests' % test_package.lower().rstrip('test')) - # Downstream prod server. + # Downstream server. else: dashboard_test_type = 'Chromium_Android_Instrumentation' diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py index 013ab7f..a7845f1 100644 --- a/build/android/pylib/constants.py +++ b/build/android/pylib/constants.py @@ -51,3 +51,5 @@ SCREENSHOTS_DIR = os.path.join(CHROME_DIR, 'out_screenshots') ANDROID_SDK_VERSION = 17 ANDROID_SDK_ROOT = os.path.join(CHROME_DIR, 'third_party/android_tools/sdk') ANDROID_NDK_ROOT = os.path.join(CHROME_DIR, 'third_party/android_tools/ndk') + +UPSTREAM_FLAKINESS_SERVER = 'test-results.appspot.com' |