Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Unified Diff: tools/telemetry/telemetry/unittest/json_results.py

Issue 456483002: Add support for uploading results to the flakiness dashboard (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove retry logic from upload Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/telemetry/telemetry/unittest/run_tests.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/unittest/json_results.py
diff --git a/tools/telemetry/telemetry/unittest/json_results.py b/tools/telemetry/telemetry/unittest/json_results.py
index 3dbb238c904f2d3f2ea5ac227366c45ade7de634..fffac0a11adca347093c2e46d92fd733a80ee977 100644
--- a/tools/telemetry/telemetry/unittest/json_results.py
+++ b/tools/telemetry/telemetry/unittest/json_results.py
@@ -5,12 +5,15 @@
import json
import time
import unittest
+import urllib2
+
# TODO(dpranke): This code is largely cloned from, and redundant with,
# src/mojo/tools/run_mojo_python_tests.py, and also duplicates logic
# in test-webkitpy and run-webkit-tests. We should consolidate the
# python TestResult parsing/converting/uploading code as much as possible.
+
def AddOptions(parser):
parser.add_option('--metadata', action='append', default=[],
help=('optional key=value metadata that will be stored '
@@ -18,7 +21,17 @@ def AddOptions(parser):
'numbers, etc.)'))
parser.add_option('--write-full-results-to', metavar='FILENAME',
action='store',
- help='path to write the list of full results to.')
+ help='The path to write the list of full results to.')
+ parser.add_option('--builder-name',
+ help='The name of the builder as shown on the waterfall.')
+ parser.add_option('--master-name',
+ help='The name of the buildbot master.')
+ parser.add_option("--test-results-server", default="",
+ help=('If specified, upload full_results.json file to '
+ 'this server.'))
+ parser.add_option('--test-type',
+ help=('Name of test type / step on the waterfall '
+ '(e.g., "telemetry_unittests").'))
def ValidateArgs(parser, args):
@@ -26,6 +39,11 @@ def ValidateArgs(parser, args):
if '=' not in val:
parser.error('Error: malformed metadata "%s"' % val)
+ if (args.test_results_server and
+ (not args.builder_name or not args.master_name or not args.test_type)):
+ parser.error('Error: --builder-name, --master-name, and --test-type '
+ 'must be specified along with --test-result-server.')
+
def WriteFullResultsIfNecessary(args, full_results):
if not args.write_full_results_to:
@@ -36,6 +54,18 @@ def WriteFullResultsIfNecessary(args, full_results):
fp.write("\n")
+def UploadFullResultsIfNecessary(args, full_results):
+ if not args.test_results_server:
+ return False, ''
+
+ url = 'http://%s/testfile/upload' % args.test_results_server
+ attrs = [('builder', args.builder_name),
+ ('master', args.master_name),
+ ('testtype', args.test_type)]
+ content_type, data = _EncodeMultiPartFormData(attrs, full_results)
+ return _UploadData(url, data, content_type)
+
+
TEST_SEPARATOR = '.'
@@ -131,3 +161,41 @@ def _AddPathToTrie(trie, path, value):
if directory not in trie:
trie[directory] = {}
_AddPathToTrie(trie[directory], rest, value)
+
+
+def _EncodeMultiPartFormData(attrs, full_results):
+ # Cloned from webkitpy/common/net/file_uploader.py
+ BOUNDARY = '-M-A-G-I-C---B-O-U-N-D-A-R-Y-'
+ CRLF = '\r\n'
+ lines = []
+
+ for key, value in attrs:
+ lines.append('--' + BOUNDARY)
+ lines.append('Content-Disposition: form-data; name="%s"' % key)
+ lines.append('')
+ lines.append(value)
+
+ lines.append('--' + BOUNDARY)
+ lines.append('Content-Disposition: form-data; name="file"; '
+ 'filename="full_results.json"')
+ lines.append('Content-Type: application/json')
+ lines.append('')
+ lines.append(json.dumps(full_results))
+
+ lines.append('--' + BOUNDARY + '--')
+ lines.append('')
+ body = CRLF.join(lines)
+ content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
+ return content_type, body
+
+
+def _UploadData(url, data, content_type):
+ request = urllib2.Request(url, data, {'Content-Type': content_type})
+ try:
+ response = urllib2.urlopen(request)
+ if response.code == 200:
+ return False, ''
+ return True, ('Uploading the JSON results failed with %d: "%s"' %
+ (response.code, response.read()))
+ except Exception as e:
+ return True, 'Uploading the JSON results raised "%s"\n' % str(e)
« no previous file with comments | « no previous file | tools/telemetry/telemetry/unittest/run_tests.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698