From f372b62905bb056ea4f993bb5845185d4214bb54 Mon Sep 17 00:00:00 2001 From: acocuzzo Date: Fri, 17 Feb 2023 10:29:42 -0500 Subject: [PATCH 1/4] ci: Refactor system tests --- tests/system.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/system.py b/tests/system.py index 44444325f..16300da9d 100644 --- a/tests/system.py +++ b/tests/system.py @@ -50,14 +50,14 @@ def project(): yield default_project -@pytest.fixture() -def publisher(): - yield pubsub_v1.PublisherClient() +@pytest.fixture(params=["grpc"]) +def publisher(transport): + yield pubsub_v1.PublisherClient(transport=transport) -@pytest.fixture() -def subscriber(): - yield pubsub_v1.SubscriberClient() +@pytest.fixture(params=["grpc"]) +def subscriber(transport): + yield pubsub_v1.SubscriberClient(transport=transport) @pytest.fixture @@ -419,8 +419,8 @@ def test_subscriber_not_leaking_open_sockets( # Also, since the client will get closed, we need another subscriber client # to clean up the subscription. We also need to make sure that auxiliary # subscriber releases the sockets, too. - subscriber = pubsub_v1.SubscriberClient() - subscriber_2 = pubsub_v1.SubscriberClient() + subscriber = pubsub_v1.SubscriberClient(transport="grpc") + subscriber_2 = pubsub_v1.SubscriberClient(transport="grpc") cleanup.append( (subscriber_2.delete_subscription, (), {"subscription": subscription_path}) ) From 4e6c3f1684ff07d15918fa735c05977e882398f1 Mon Sep 17 00:00:00 2001 From: acocuzzo Date: Fri, 17 Feb 2023 11:08:57 -0500 Subject: [PATCH 2/4] add rest param --- tests/system.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system.py b/tests/system.py index 16300da9d..216f8e85c 100644 --- a/tests/system.py +++ b/tests/system.py @@ -50,12 +50,12 @@ def project(): yield default_project -@pytest.fixture(params=["grpc"]) +@pytest.fixture(params=["grpc", "rest"]) def publisher(transport): yield pubsub_v1.PublisherClient(transport=transport) -@pytest.fixture(params=["grpc"]) +@pytest.fixture(params=["grpc", "rest"]) def subscriber(transport): yield pubsub_v1.SubscriberClient(transport=transport) From 331842754b56911d82d7a9fec3c2fe435627704c Mon Sep 17 00:00:00 2001 From: acocuzzo Date: Fri, 17 Feb 2023 12:53:33 -0500 Subject: [PATCH 3/4] fix param name --- tests/system.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system.py b/tests/system.py index 216f8e85c..bbe0119e3 100644 --- a/tests/system.py +++ b/tests/system.py @@ -51,13 +51,13 @@ def project(): @pytest.fixture(params=["grpc", "rest"]) -def publisher(transport): - yield pubsub_v1.PublisherClient(transport=transport) +def publisher(request): + yield pubsub_v1.PublisherClient(transport=request.param) @pytest.fixture(params=["grpc", "rest"]) -def subscriber(transport): - yield pubsub_v1.SubscriberClient(transport=transport) +def subscriber(request): + yield pubsub_v1.SubscriberClient(transport=request.param) @pytest.fixture From 19454a983043840e0b1bb9a4d1d28a289e659389 Mon Sep 17 00:00:00 2001 From: acocuzzo Date: Fri, 17 Feb 2023 14:03:01 -0500 Subject: [PATCH 4/4] remove rest --- tests/system.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system.py b/tests/system.py index bbe0119e3..d7f7c5bea 100644 --- a/tests/system.py +++ b/tests/system.py @@ -50,12 +50,12 @@ def project(): yield default_project -@pytest.fixture(params=["grpc", "rest"]) +@pytest.fixture(params=["grpc"]) def publisher(request): yield pubsub_v1.PublisherClient(transport=request.param) -@pytest.fixture(params=["grpc", "rest"]) +@pytest.fixture(params=["grpc"]) def subscriber(request): yield pubsub_v1.SubscriberClient(transport=request.param)