Merge pull request ClickHouse#17299 from Jokser/flaky-s3-test-custom-auth-headers

alexey-milovidov · web-flow · commit ac710ff0b771 · 2020-11-23T20:33:48.000+03:00
Fixed flaky test_storage_s3::test_custom_auth_headers
diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
@@ -351,14 +351,23 @@ def run_s3_mock(cluster):
     current_dir = os.path.dirname(__file__)
     cluster.copy_file_to_container(container_id, os.path.join(current_dir, "s3_mock", "mock_s3.py"), "mock_s3.py")
     cluster.exec_in_container(container_id, ["python", "mock_s3.py"], detach=True)
+
+    # Wait for S3 mock start
+    for attempt in range(10):
+        ping_response = cluster.exec_in_container(cluster.get_container_id('resolver'),
+                                                  ["curl", "-s", "http://resolver:8080/"], nothrow=True)
+        if ping_response != 'OK':
+            if attempt == 9:
+                assert ping_response == 'OK', 'Expected "OK", but got "{}"'.format(ping_response)
+            else:
+                time.sleep(1)
+        else:
+            break
+
     logging.info("S3 mock started")
 
 
 def test_custom_auth_headers(cluster):
-    ping_response = cluster.exec_in_container(cluster.get_container_id('resolver'),
-                                              ["curl", "-s", "http://resolver:8080"])
-    assert ping_response == 'OK', 'Expected "OK", but got "{}"'.format(ping_response)
-
     table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
     filename = "test.csv"
     get_query = "select * from s3('http://resolver:8080/{bucket}/{file}', 'CSV', '{table_format}')".format(
