Commit 816bf2ca authored by ojan@chromium.org's avatar ojan@chromium.org

Include the master name when querying the test results server.

This will soon be required since leaving the master name out mean
that multiple files could match the query.

* Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@100873 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 319ca883
2011-11-20 Ojan Vafai <ojan@chromium.org>
Include the master name when querying the test results server.
This will soon be required since leaving the master name out mean
that multiple files could match the query.
* Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
2011-11-19 Ojan Vafai <ojan@chromium.org>
Fix jsonp callback code to add the callback if json content
......@@ -191,8 +191,7 @@ class JSONResultsGeneratorBase(object):
TIMES_MS_FILENAME = "times_ms.json"
INCREMENTAL_RESULTS_FILENAME = "incremental_results.json"
URL_FOR_TEST_LIST_JSON = \
"http://%s/testfile?builder=%s&name=%s&testlistjson=1&testtype=%s"
URL_FOR_TEST_LIST_JSON = "http://%s/testfile?builder=%s&name=%s&testlistjson=1&testtype=%s&master=%s"
# FIXME: Remove generate_incremental_results once the reference to it in
# http://src.chromium.org/viewvc/chrome/trunk/tools/build/scripts/slave/gtest_slave_utils.py
......@@ -419,7 +418,8 @@ class JSONResultsGeneratorBase(object):
(urllib2.quote(self._test_results_server),
urllib2.quote(self._builder_name),
self.RESULTS_FILENAME,
urllib2.quote(self._test_type)))
urllib2.quote(self._test_type),
urllib2.quote(self._master_name)))
try:
# FIXME: We should talk to the network via a Host object.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment