[webkit-changes] [252666] branches/safari-608-branch/Tools

Tue, 19 Nov 2019 17:26:24 -0800

Title: [252666] branches/safari-608-branch/Tools
Revision
252666
Author
[email protected]
Date
2019-11-19 17:24:53 -0800 (Tue, 19 Nov 2019)

Log Message

Cherry-pick r250997. rdar://problem/56177210

    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: https://svn.webkit.org/repository/webkit/trunk@250997 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-608-branch/Tools/ChangeLog (252665 => 252666)


--- branches/safari-608-branch/Tools/ChangeLog	2019-11-20 01:24:50 UTC (rev 252665)
+++ branches/safari-608-branch/Tools/ChangeLog	2019-11-20 01:24:53 UTC (rev 252666)
@@ -1,5 +1,44 @@
 2019-11-19  Alan Coon  <[email protected]>
 
+        Cherry-pick r250997. rdar://problem/56177210
+
+    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: https://svn.webkit.org/repository/webkit/trunk@250997 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-11-19  Alan Coon  <[email protected]>
+
         Cherry-pick r250966. rdar://problem/56047710
 
     results.webkit.org: Start reporting results

Modified: branches/safari-608-branch/Tools/Scripts/webkitpy/results/upload.py (252665 => 252666)


--- branches/safari-608-branch/Tools/Scripts/webkitpy/results/upload.py	2019-11-20 01:24:50 UTC (rev 252665)
+++ branches/safari-608-branch/Tools/Scripts/webkitpy/results/upload.py	2019-11-20 01:24:53 UTC (rev 252666)
@@ -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: branches/safari-608-branch/Tools/Scripts/webkitpy/results/upload_unittest.py (252665 => 252666)


--- branches/safari-608-branch/Tools/Scripts/webkitpy/results/upload_unittest.py	2019-11-20 01:24:50 UTC (rev 252665)
+++ branches/safari-608-branch/Tools/Scripts/webkitpy/results/upload_unittest.py	2019-11-20 01:24:53 UTC (rev 252666)
@@ -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