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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250997 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2b42630..a8ba27b 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,20 @@
+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>
W3C test importer breaks svg files.
diff --git a/Tools/Scripts/webkitpy/results/upload.py b/Tools/Scripts/webkitpy/results/upload.py
index b7c79fa..29ed27c 100644
--- a/Tools/Scripts/webkitpy/results/upload.py
+++ b/Tools/Scripts/webkitpy/results/upload.py
@@ -178,6 +178,7 @@
'{}{}'.format(hostname, self.UPLOAD_ENDPOINT),
headers={'Content-type': 'application/json'},
data=json.dumps(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=meta_data,
files=dict(file=archive),
+ verify=False,
)
except requests.exceptions.ConnectionError:
diff --git a/Tools/Scripts/webkitpy/results/upload_unittest.py b/Tools/Scripts/webkitpy/results/upload_unittest.py
index 41fa1cd..17b120a 100644
--- a/Tools/Scripts/webkitpy/results/upload_unittest.py
+++ b/Tools/Scripts/webkitpy/results/upload_unittest.py
@@ -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')),
))
