Changeset 250997 in webkit

Timestamp:

Oct 10, 2019, 6:30:25 PM (7 years ago)

Author:

Jonathan Bedard

Message:

results.webkit.org: Sort out certificates on Catalina
​https://bugs.webkit.org/show_bug.cgi?id=202837

Unreviewed infrastructure repair.

This is a temporary strategy until we sort out our certificates on the newly
deployed Catalina bots.

• Scripts/webkitpy/results/upload.py:

(Upload.upload):
(Upload.upload_archive):

• Scripts/webkitpy/results/upload_unittest.py:

(UploadTest.test_upload):
(UploadTest.test_archive_upload):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/results/upload.py (modified) (2 diffs)
• Scripts/webkitpy/results/upload_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-10-10  Jonathan Bedard  <jbedard@apple.com>
+
+        results.webkit.org: Sort out certificates on Catalina
+        https://bugs.webkit.org/show_bug.cgi?id=202837
+
+        Unreviewed infrastructure repair.
+
+        This is a temporary strategy until we sort out our certificates on the newly
+        deployed Catalina bots.
+
+        * Scripts/webkitpy/results/upload.py:
+        (Upload.upload):
+        (Upload.upload_archive):
+        * Scripts/webkitpy/results/upload_unittest.py:
+        (UploadTest.test_upload):
+        (UploadTest.test_archive_upload):
+
 2019-10-10  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Tools/Scripts/webkitpy/results/upload.py

@@ -179 +179 @@
                 headers={'Content-type': 'application/json'},
                 data=json.dumps(data),
+                verify=False,
             )
         except requests.exceptions.ConnectionError:
@@ -216 +217 @@
                 data=meta_data,
                 files=dict(file=archive),
+                verify=False,
             )
 

trunk/Tools/Scripts/webkitpy/results/upload_unittest.py

@@ -127 +127 @@
         )
 
-        with mock.patch('requests.post', new=lambda url, headers={}, data={}: self.MockResponse()):
+        with mock.patch('requests.post', new=lambda url, headers={}, data={}, verify=True: self.MockResponse()):
             self.assertTrue(upload.upload('https://results.webkit.org', log_line_func=lambda _: None))
 
-        with mock.patch('requests.post', new=lambda url, headers={}, data={}: self.raise_requests_ConnectionError()):
+        with mock.patch('requests.post', new=lambda url, headers={}, data={}, verify=True: self.raise_requests_ConnectionError()):
             lines = []
             self.assertFalse(upload.upload('https://results.webkit.org', log_line_func=lambda line: lines.append(line)))
             self.assertEqual([' ' * 4 + 'Failed to upload to https://results.webkit.org, results server not online'], lines)
 
-        mock_404 = mock.patch('requests.post', new=lambda url, headers={}, data={}: self.MockResponse(
+        mock_404 = mock.patch('requests.post', new=lambda url, headers={}, data={}, verify=True: self.MockResponse(
             status_code=404,
             text=json.dumps(dict(description='No such address')),
@@ -228 +228 @@
         )
 
-        with mock.patch('requests.post', new=lambda url, headers={}, data={}, files={}: self.MockResponse()):
+        with mock.patch('requests.post', new=lambda url, headers={}, data={}, files={}, verify=True: self.MockResponse()):
             self.assertTrue(upload.upload_archive('https://results.webkit.org', archive='content', log_line_func=lambda _: None))
 
-        with mock.patch('requests.post', new=lambda url, headers={}, data={}, files={}: self.raise_requests_ConnectionError()):
+        with mock.patch('requests.post', new=lambda url, headers={}, data={}, files={}, verify=True: self.raise_requests_ConnectionError()):
             lines = []
             self.assertFalse(upload.upload_archive('https://results.webkit.org', archive='content', log_line_func=lambda line: lines.append(line)))
             self.assertEqual([' ' * 4 + 'Failed to upload test archive to https://results.webkit.org, results server not online'], lines)
 
-        mock_404 = mock.patch('requests.post', new=lambda url, headers={}, data={}, files={}: self.MockResponse(
+        mock_404 = mock.patch('requests.post', new=lambda url, headers={}, data={}, files={}, verify=True: self.MockResponse(
             status_code=404,
             text=json.dumps(dict(description='No such address')),