commit 35331923b30e031a3b3573533bb3b411453d1273
author Scott Cunningham <scunningham@chromium.org> Mon Feb 22 11:42:05 2016 -0800
committer chrome-bot <chrome-bot@chromium.org> Tue Feb 23 22:40:15 2016 -0800
tree 4ae24259397047a18e9f6405b67a7ca906c29789
parent b6160fc08979365435abb1ddec14ad67b1ed513e

Use internal url that needs no user authentication.

Request to https://chromegw.corp.google.com/p/chromeos.chrome/
builders/Linux%20ChromeOS%20Buildspec%20Tests responds with user
authentication request. Change /p/ to /i/ (for internal) to avoid
authentication.

BUG=chromium:588811

TEST=Put a tests file in the same directory as script. Then run:
$ ./browsertest_status.py --tests_file=tests

Change-Id: I6fabf4ac90fc41b7f90423902f6571903d919daa
Reviewed-on: https://chromium-review.googlesource.com/328816
Commit-Ready: Scott Cunningham <scunningham@chromium.org>
Tested-by: Scott Cunningham <scunningham@chromium.org>
Reviewed-by: Scott Cunningham <scunningham@chromium.org>
Reviewed-by: Daniel Jacques <dnj@chromium.org>

provingground/browsertest_status.py

diff --git a/provingground/browsertest_status.py b/provingground/browsertest_status.py
index 020cc2f..82e7769 100755
--- a/provingground/browsertest_status.py
+++ b/provingground/browsertest_status.py
@@ -9,7 +9,7 @@
 #
 # Latest test run status for a build is fetched from the builder, read from
 # the 'stdio' text file located at:
-#   http://BUILDER_HOST/p/BUILDER_PROJECT/builders/BUILDER_NAME/
+#   http://BUILDER_HOST/i/BUILDER_PROJECT/builders/BUILDER_NAME/
 #   builds/BUILD_NUMBER/steps/TEST_TYPE/logs/stdio/text
 #
 
@@ -83,12 +83,12 @@
   """
   # Generate percent-encoded builder url.
   builder_url = (
-      'https://%s/p/%s/builders/%s' %
+      'https://%s/i/%s/builders/%s' %
       (urllib2.quote(build_dict['builder_host']),
        urllib2.quote(build_dict['builder_proj']),
        urllib2.quote(build_dict['builder_name'])))
   builder_json_url = (
-      'https://%s/p/%s/json/builders/%s' %
+      'https://%s/i/%s/json/builders/%s' %
       (urllib2.quote(build_dict['builder_host']),
        urllib2.quote(build_dict['builder_proj']),
        urllib2.quote(build_dict['builder_name'])))
@@ -96,9 +96,9 @@
   # Fetch builder status file from builder url.
   print('\nFetching builder status file from: %s' % builder_url)
   try:
-    response = urllib2.urlopen(builder_json_url)
-    builder_status_file = response.read()
-    response.close()
+    builder_status_file = urllib2.urlopen(builder_json_url)
+    builder_status = builder_status_file.read()
+    builder_status_file.close()
   except urllib2.HTTPError as err:
     print('HTTP error: %s' % err)
     sys.exit(2)
@@ -107,7 +107,7 @@
     sys.exit(2)
 
   # Convert json builder status file to dictionary.
-  builder_status_dict = json.loads(builder_status_file)
+  builder_status_dict = json.loads(builder_status)
   build_list = builder_status_dict['cachedBuilds']
   print('\nList of avaiable builds: %s\n' % build_list)
   return build_list
@@ -254,13 +254,13 @@
   """
   # Generate percent-encoded build test status url.
   build_url = (
-      'https://%s/p/%s/builders/%s/builds/%s' %
+      'https://%s/i/%s/builders/%s/builds/%s' %
       (urllib2.quote(build_dict['builder_host']),
        urllib2.quote(build_dict['builder_proj']),
        urllib2.quote(build_dict['builder_name']),
        build_dict['build_num']))
   build_json_url = (
-      'https://%s/p/%s/json/builders/%s/builds?select=%s/steps/%s/' %
+      'https://%s/i/%s/json/builders/%s/builds?select=%s/steps/%s/' %
       (urllib2.quote(build_dict['builder_host']),
        urllib2.quote(build_dict['builder_proj']),
        urllib2.quote(build_dict['builder_name']),
@@ -288,13 +288,13 @@
 
   # Generate percent-encoded build status url.
   build_url = (
-      'https://%s/p/%s/builders/%s/builds/%s' %
+      'https://%s/i/%s/builders/%s/builds/%s' %
       (urllib2.quote(build_dict['builder_host']),
        urllib2.quote(build_dict['builder_proj']),
        urllib2.quote(build_dict['builder_name']),
        build_num))
   build_url_json = (
-      'https://%s/p/%s/json/builders/%s/builds/%s' %
+      'https://%s/i/%s/json/builders/%s/builds/%s' %
       (urllib2.quote(build_dict['builder_host']),
        urllib2.quote(build_dict['builder_proj']),
        urllib2.quote(build_dict['builder_name']),
@@ -315,12 +315,12 @@
   """
   # Fetch json status file from build url.
   hosted_url = _SetUrlHost(build_url_json, build_dict['builder_host'])
-  url = urllib2.urlopen(hosted_url)
-  status_file = url.read()
-  url.close()
+  status_file = urllib2.urlopen(hosted_url)
+  status = status_file.read()
+  status_file.close()
 
-  # Convert json status file to status dictionary and return.
-  return json.loads(status_file)
+  # Convert json status to status dictionary and return.
+  return json.loads(status)
 
 
 def _GetBuildProperty(build_properties, property_name):