[webkit-changes] [250997] trunk/Tools

Thu, 10 Oct 2019 18:31:55 -0700

Title: [250997] trunk/Tools
Revision
250997
Author
[email protected]
Date
2019-10-10 18:30:25 -0700 (Thu, 10 Oct 2019)

Log 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):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (250996 => 250997)


--- trunk/Tools/ChangeLog	2019-10-11 00:25:40 UTC (rev 250996)
+++ trunk/Tools/ChangeLog	2019-10-11 01:30:25 UTC (rev 250997)
@@ -1,3 +1,20 @@
+2019-10-10  Jonathan Bedard  <[email protected]>
+
+        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  <[email protected]>
 
         W3C test importer breaks svg files.

Modified: trunk/Tools/Scripts/webkitpy/results/upload.py (250996 => 250997)


--- trunk/Tools/Scripts/webkitpy/results/upload.py	2019-10-11 00:25:40 UTC (rev 250996)
+++ trunk/Tools/Scripts/webkitpy/results/upload.py	2019-10-11 01:30:25 UTC (rev 250997)
@@ -178,6 +178,7 @@
                 '{}{}'.format(hostname, self.UPLOAD_ENDPOINT),
                 headers={'Content-type': 'application/json'},
                 data=""
+                verify=False,
             )
         except requests.exceptions.ConnectionError:
             log_line_func(' ' * 4 + 'Failed to upload to {}, results server not online'.format(hostname))
@@ -215,6 +216,7 @@
                 '{}{}'.format(hostname, self.ARCHIVE_UPLOAD_ENDPOINT),
                 data=""
                 files=dict(file=archive),
+                verify=False,
             )
 
         except requests.exceptions.ConnectionError:

Modified: trunk/Tools/Scripts/webkitpy/results/upload_unittest.py (250996 => 250997)


--- trunk/Tools/Scripts/webkitpy/results/upload_unittest.py	2019-10-11 00:25:40 UTC (rev 250996)
+++ trunk/Tools/Scripts/webkitpy/results/upload_unittest.py	2019-10-11 01:30:25 UTC (rev 250997)
@@ -126,15 +126,15 @@
             )],
         )
 
-        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')),
         ))
@@ -227,15 +227,15 @@
             )],
         )
 
-        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')),
         ))

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to