Changeset 165413 in webkit

Timestamp:

Mar 10, 2014 4:22:05 PM (10 years ago)

Author:

zoltan@webkit.org

Message:

Let the user define the full address of the performance-site-server for uploading results
​https://bugs.webkit.org/show_bug.cgi?id=129819

Reviewed by Ryosuke Niwa.

Currently perftestsrunner.py assumes that the server uses https protocol all the time, which
can be confusing. It's more straightforward, if you need to define explicitly the server's full
address along with the protocol, when you're using this parameter. I added HTTPS as the default
protocol for now, in order to avoid breaking the perf bots.

• Scripts/webkitpy/performance_tests/perftestsrunner.py:

(_upload_json):

• Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:

(MainTest.test_upload_json):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftestsrunner.py (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-03-10  Zoltan Horvath  <zoltan@webkit.org>
+
+        Let the user define the full address of the performance-site-server for uploading results
+        https://bugs.webkit.org/show_bug.cgi?id=129819
+
+        Reviewed by Ryosuke Niwa.
+
+        Currently perftestsrunner.py assumes that the server uses https protocol all the time, which
+        can be confusing. It's more straightforward, if you need to define explicitly the server's full
+        address along with the protocol, when you're using this parameter. I added HTTPS as the default
+        protocol for now, in order to avoid breaking the perf bots.
+
+        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+        (_upload_json):
+        * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
+        (MainTest.test_upload_json):
+
 2014-03-10  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

@@ -310 +310 @@
 
     def _upload_json(self, test_results_server, json_path, host_path="/api/report", file_uploader=FileUploader):
-        url = "https://%s%s" % (test_results_server, host_path)
+        hypertext_protocol = ''
+        if not test_results_server.startswith('http'):
+            hypertext_protocol = 'https://'
+        url = hypertext_protocol + test_results_server + host_path
         uploader = file_uploader(url, 120)
         try:

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py

@@ -187 +187 @@
 
         MockFileUploader.upload_single_text_file_return_value = StringIO.StringIO('OK')
+        self.assertTrue(runner._upload_json('https://some.host', 'some.json', '/some/path', MockFileUploader))
+        self.assertEqual(MockFileUploader.called, ['FileUploader', 'upload_single_text_file'])
+
+        MockFileUploader.reset()
+        MockFileUploader.upload_single_text_file_return_value = StringIO.StringIO('OK')
         self.assertTrue(runner._upload_json('some.host', 'some.json', '/some/path', MockFileUploader))
-        self.assertEqual(MockFileUploader.called, ['FileUploader', 'upload_single_text_file'])
 
         MockFileUploader.reset()
@@ -194 +198 @@
         output = OutputCapture()
         output.capture_output()
-        self.assertFalse(runner._upload_json('some.host', 'some.json', '/some/path', MockFileUploader))
+        self.assertFalse(runner._upload_json('https://some.host', 'some.json', '/some/path', MockFileUploader))
         _, _, logs = output.restore_output()
         self.assertEqual(logs, 'Uploaded JSON to https://some.host/some/path but got a bad response:\nSome error\n')
@@ -201 +205 @@
         MockFileUploader.reset()
         MockFileUploader.upload_single_text_file_throws = True
-        self.assertFalse(runner._upload_json('some.host', 'some.json', '/some/path', MockFileUploader))
+        self.assertFalse(runner._upload_json('https://some.host', 'some.json', '/some/path', MockFileUploader))
         self.assertEqual(MockFileUploader.called, ['FileUploader', 'upload_single_text_file'])
 
         MockFileUploader.reset()
         MockFileUploader.upload_single_text_file_return_value = StringIO.StringIO('{"status": "OK"}')
-        self.assertTrue(runner._upload_json('some.host', 'some.json', '/some/path', MockFileUploader))
+        self.assertTrue(runner._upload_json('https://some.host', 'some.json', '/some/path', MockFileUploader))
         self.assertEqual(MockFileUploader.called, ['FileUploader', 'upload_single_text_file'])
 
@@ -213 +217 @@
         output = OutputCapture()
         output.capture_output()
-        self.assertFalse(runner._upload_json('some.host', 'some.json', '/some/path', MockFileUploader))
+        self.assertFalse(runner._upload_json('https://some.host', 'some.json', '/some/path', MockFileUploader))
         _, _, logs = output.restore_output()
         serialized_json = json.dumps({'status': 'SomethingHasFailed', 'failureStored': False}, indent=4)