Skip to content
This repository was archived by the owner on Feb 13, 2024. It is now read-only.

Commit 5f1468f

Browse files
author
Takashi Matsuo
authored
testing(vision): use different ids for test functions [(#4227)](GoogleCloudPlatform/python-docs-samples#4227)
fixes #4224
1 parent 8115ae7 commit 5f1468f

File tree

1 file changed

+28
-25
lines changed

1 file changed

+28
-25
lines changed

samples/snippets/product_search/product_in_product_set_management_test.py

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,61 +29,64 @@
2929
LOCATION = 'us-west1'
3030

3131
PRODUCT_SET_DISPLAY_NAME = 'fake_product_set_display_name_for_testing'
32-
PRODUCT_SET_ID = 'test_set_{}'.format(uuid.uuid4())
3332

3433
PRODUCT_DISPLAY_NAME = 'fake_product_display_name_for_testing'
3534
PRODUCT_CATEGORY = 'homegoods'
36-
PRODUCT_ID = 'test_product_{}'.format(uuid.uuid4())
3735

3836

39-
@pytest.fixture(scope="function", autouse=True)
40-
def setup_teardown():
37+
@pytest.fixture(scope="function")
38+
def test_resources():
4139
# set up
40+
product_set_id = f'test_set_{uuid.uuid4()}'
41+
product_id = f'test_product_{uuid.uuid4()}'
4242
create_product_set(
43-
PROJECT_ID, LOCATION, PRODUCT_SET_ID, PRODUCT_SET_DISPLAY_NAME)
43+
PROJECT_ID, LOCATION, product_set_id, PRODUCT_SET_DISPLAY_NAME)
4444
create_product(
45-
PROJECT_ID, LOCATION, PRODUCT_ID,
45+
PROJECT_ID, LOCATION, product_id,
4646
PRODUCT_DISPLAY_NAME, PRODUCT_CATEGORY)
4747

48-
yield
48+
yield product_set_id, product_id
4949

5050
# tear down
51-
delete_product(PROJECT_ID, LOCATION, PRODUCT_ID)
52-
delete_product_set(PROJECT_ID, LOCATION, PRODUCT_SET_ID)
51+
delete_product(PROJECT_ID, LOCATION, product_id)
52+
delete_product_set(PROJECT_ID, LOCATION, product_set_id)
5353

5454

55-
def test_add_product_to_product_set(capsys):
55+
def test_add_product_to_product_set(capsys, test_resources):
56+
product_set_id, product_id = test_resources
5657
add_product_to_product_set(
57-
PROJECT_ID, LOCATION, PRODUCT_ID, PRODUCT_SET_ID)
58-
list_products_in_product_set(PROJECT_ID, LOCATION, PRODUCT_SET_ID)
58+
PROJECT_ID, LOCATION, product_id, product_set_id)
59+
list_products_in_product_set(PROJECT_ID, LOCATION, product_set_id)
5960
out, _ = capsys.readouterr()
60-
assert 'Product id: {}'.format(PRODUCT_ID) in out
61+
assert 'Product id: {}'.format(product_id) in out
6162

6263

63-
def test_remove_product_from_product_set(capsys):
64+
def test_remove_product_from_product_set(capsys, test_resources):
65+
product_set_id, product_id = test_resources
6466
add_product_to_product_set(
65-
PROJECT_ID, LOCATION, PRODUCT_ID, PRODUCT_SET_ID)
66-
list_products_in_product_set(PROJECT_ID, LOCATION, PRODUCT_SET_ID)
67+
PROJECT_ID, LOCATION, product_id, product_set_id)
68+
list_products_in_product_set(PROJECT_ID, LOCATION, product_set_id)
6769
out, _ = capsys.readouterr()
68-
assert 'Product id: {}'.format(PRODUCT_ID) in out
70+
assert 'Product id: {}'.format(product_id) in out
6971

7072
remove_product_from_product_set(
71-
PROJECT_ID, LOCATION, PRODUCT_ID, PRODUCT_SET_ID)
72-
list_products_in_product_set(PROJECT_ID, LOCATION, PRODUCT_SET_ID)
73+
PROJECT_ID, LOCATION, product_id, product_set_id)
74+
list_products_in_product_set(PROJECT_ID, LOCATION, product_set_id)
7375
out, _ = capsys.readouterr()
74-
assert 'Product id: {}'.format(PRODUCT_ID) not in out
76+
assert 'Product id: {}'.format(product_id) not in out
7577

7678

77-
def test_purge_products_in_product_set(capsys):
79+
def test_purge_products_in_product_set(capsys, test_resources):
80+
product_set_id, product_id = test_resources
7881
add_product_to_product_set(
79-
PROJECT_ID, LOCATION, PRODUCT_ID, PRODUCT_SET_ID)
82+
PROJECT_ID, LOCATION, product_id, product_set_id)
8083
list_products(PROJECT_ID, LOCATION)
8184
out, _ = capsys.readouterr()
82-
assert 'Product id: {}'.format(PRODUCT_ID) in out
85+
assert 'Product id: {}'.format(product_id) in out
8386

8487
purge_products_in_product_set(
85-
PROJECT_ID, LOCATION, PRODUCT_SET_ID, force=True)
88+
PROJECT_ID, LOCATION, product_set_id, force=True)
8689

8790
list_products(PROJECT_ID, LOCATION)
8891
out, _ = capsys.readouterr()
89-
assert 'Product id: {}'.format(PRODUCT_ID) not in out
92+
assert 'Product id: {}'.format(product_id) not in out

0 commit comments

Comments
 (0)