From 385d7417b2ada399d98f27651ef83a921b8c79b9 Mon Sep 17 00:00:00 2001 From: Noah Negrey Date: Tue, 14 Apr 2020 14:36:08 -0600 Subject: [PATCH] vision: increase timeout for tests (#3383) Fix: https://github.com/GoogleCloudPlatform/python-docs-samples/issues/2955 Fix: https://github.com/GoogleCloudPlatform/python-docs-samples/issues/2992 --- .../product_search/product_in_product_set_management.py | 2 +- vision/cloud-client/product_search/product_management.py | 2 +- vision/cloud-client/product_search/product_search_test.py | 2 ++ vision/cloud-client/product_search/requirements-test.txt | 1 + 4 files changed, 5 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 fcf4fa6179de..ad16ab7eca02 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 8e96ee9e75d6..46ed4f7bc0e5 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] diff --git a/vision/cloud-client/product_search/product_search_test.py b/vision/cloud-client/product_search/product_search_test.py index ae518cd24ed0..8b45341cc114 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, diff --git a/vision/cloud-client/product_search/requirements-test.txt b/vision/cloud-client/product_search/requirements-test.txt index 781d4326c947..5577bd8067cb 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