green test

rele/client.py

@@ -56,7 +56,7 @@ def __init__(
         self._ack_deadline = default_ack_deadline or DEFAULT_ACK_DEADLINE
         self.credentials = credentials if not USE_EMULATOR else None
         self._message_storage_policy = message_storage_policy
-        self._client = pubsub_v1.SubscriberClient(credentials=credentials)
+        self._client = pubsub_v1.SubscriberClient(credentials=credentials, client_options=client_options)
         self._retry_policy = default_retry_policy
 
     def update_or_create_subscription(self, subscription):

tests/commands/test_runrele.py

@@ -18,7 +18,7 @@ def test_calls_worker_start_and_setup_when_runrele(self, mock_worker):
         call_command("runrele")
 
         mock_worker.assert_called_with(
-            [], "rele-test", ANY, "europe-west1", 60, 2, None
+            [], None, "rele-test", ANY, "europe-west1", 60, 2, None
         )
         mock_worker.return_value.run_forever.assert_called_once_with()
 
@@ -35,6 +35,6 @@ def test_prints_warning_when_conn_max_age_not_set_to_zero(
             "be exhausted." in err
         )
         mock_worker.assert_called_with(
-            [], "rele-test", ANY, "europe-west1", 60, 2, None
+            [], None, "rele-test", ANY, "europe-west1", 60, 2, None
         )
         mock_worker.return_value.run_forever.assert_called_once_with()

tests/conftest.py

@@ -57,7 +57,7 @@ def mock_worker():
 @pytest.fixture
 def subscriber(project_id, config):
     return Subscriber(
-        config.gc_project_id, config.credentials, config.gc_storage_region, 60
+        config.gc_project_id, config.credentials, config.gc_storage_region, config.client_options, 60
     )
 
 

tests/test_subscriber.py

@@ -212,6 +212,7 @@ def test_default_retry_policy_is_applied_when_not_explicitly_provided(
             config_with_retry_policy.gc_project_id,
             config_with_retry_policy.credentials,
             config_with_retry_policy.gc_storage_region,
+            config_with_retry_policy.client_options,
             60,
             config_with_retry_policy.retry_policy,
         )

tests/test_worker.py

@@ -26,6 +26,7 @@ def worker(config):
     subscriptions = (sub_stub,)
     return Worker(
         subscriptions,
+        config.client_options,
         config.gc_project_id,
         config.credentials,
         config.gc_storage_region,
@@ -115,6 +116,7 @@ def test_creates_subscription_with_custom_ack_deadline_from_environment(
         custom_ack_deadline = 234
         worker = Worker(
             subscriptions,
+            config.client_options,
             config.gc_project_id,
             config.gc_storage_region,
             config.credentials,
@@ -241,6 +243,7 @@ def test_waits_forever_when_called_with_config_and_subs(
 
         mock_worker.assert_called_with(
             subscriptions,
+            None,
             "rele-test",
             ANY,
             "some-region",