From f4000f9a90bd4d44e1672af732c695056283889a Mon Sep 17 00:00:00 2001 From: nnegrey Date: Mon, 13 Apr 2020 10:18:53 -0600 Subject: [PATCH 1/3] vision: increase timeout for tests --- .../product_search/product_in_product_set_management.py | 2 +- vision/cloud-client/product_search/product_management.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vision/cloud-client/product_search/product_in_product_set_management.py b/vision/cloud-client/product_search/product_in_product_set_management.py index fcf4fa6179d..ad16ab7eca0 100755 --- a/vision/cloud-client/product_search/product_in_product_set_management.py +++ b/vision/cloud-client/product_search/product_in_product_set_management.py @@ -147,7 +147,7 @@ def purge_products_in_product_set( # If force is not set to True, the service raises an exception. force=force) - operation.result(timeout=120) + operation.result(timeout=300) print('Deleted products in product set.') # [END vision_product_search_purge_products_in_product_set] diff --git a/vision/cloud-client/product_search/product_management.py b/vision/cloud-client/product_search/product_management.py index 8e96ee9e75d..46ed4f7bc0e 100755 --- a/vision/cloud-client/product_search/product_management.py +++ b/vision/cloud-client/product_search/product_management.py @@ -205,7 +205,7 @@ def purge_orphan_products(project_id, location, force): # If force is not set to True, the service raises an exception. force=force) - operation.result(timeout=120) + operation.result(timeout=300) print('Orphan products deleted.') # [END vision_product_search_purge_orphan_products] From 3c94fbf7b9d83f36acb606e55c1e2eaa5d9e52d2 Mon Sep 17 00:00:00 2001 From: nnegrey Date: Mon, 13 Apr 2020 10:57:06 -0600 Subject: [PATCH 2/3] mark test as flaky --- vision/cloud-client/product_search/product_search_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vision/cloud-client/product_search/product_search_test.py b/vision/cloud-client/product_search/product_search_test.py index ae518cd24ed..8b45341cc11 100644 --- a/vision/cloud-client/product_search/product_search_test.py +++ b/vision/cloud-client/product_search/product_search_test.py @@ -13,6 +13,7 @@ # limitations under the License. import os +from flaky import flaky from product_search import get_similar_products_file, get_similar_products_uri @@ -30,6 +31,7 @@ FILTER = 'style=womens' +@flaky(max_runs=5, min_passes=1) def test_get_similar_products_file(capsys): get_similar_products_file( PROJECT_ID, LOCATION, PRODUCT_SET_ID, PRODUCT_CATEGORY, FILE_PATH_1, From fab1542ec67860f42bff3f8080dcee700792a225 Mon Sep 17 00:00:00 2001 From: nnegrey Date: Mon, 13 Apr 2020 11:01:56 -0600 Subject: [PATCH 3/3] Add requirement --- vision/cloud-client/product_search/requirements-test.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/vision/cloud-client/product_search/requirements-test.txt b/vision/cloud-client/product_search/requirements-test.txt index 781d4326c94..5577bd8067c 100644 --- a/vision/cloud-client/product_search/requirements-test.txt +++ b/vision/cloud-client/product_search/requirements-test.txt @@ -1 +1,2 @@ pytest==5.3.2 +flaky==3.6.1 \ No newline at end of file