Merge pull request #1135 from cloudbees-oss/fix-ci-4

Fix CI on the v1 branch

Author: ono-max

tests/commands/test_api_error.py

@@ -3,6 +3,7 @@
 import platform
 import tempfile
 import threading
+import time
 from http.server import HTTPServer, SimpleHTTPRequestHandler
 from pathlib import Path
 from unittest import mock
@@ -464,4 +465,11 @@ def test_all_workflow_when_server_down(self):
     def assert_tracking_count(self, tracking, count: int):
         # Prior to 3.6, `Response` object can't be obtained.
         if compare_version([int(x) for x in platform.python_version().split('.')], [3, 7]) >= 0:
-            assert tracking.call_count == count
+            # Sometimes, `tracking.call_count` is not updated immediately. So, wait a moment until it is updated.
+            attempt = 0
+            while tracking.call_count < count:
+                time.sleep(0.1)
+                attempt += 1
+                if attempt > 10:
+                    break
+            self.assertEqual(tracking.call_count, count)

tests/utils/test_http_client.py

@@ -51,8 +51,8 @@ def test_reason(self):
 
         # use new session to disable retry
         cli = _HttpClient(session=Session())
-        # /error is an actual endpoint that exists on our service to test the behavior
-        res = cli.request("GET", "intake/error")
+        # /raise_error is an actual endpoint that exists on our service to test the behavior
+        res = cli.request("GET", "intake/raise_error")
         self.assertEqual(res.status_code, 500)
         self.assertEqual(res.reason, "Welp")