From a3bfc44fe2fbb8c539aedd206607e823f30fc770 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Tue, 15 Jun 2021 13:00:39 -0700 Subject: [PATCH 1/2] added code to remove extra topics in snippet tests --- samples/snippets/usage_guide.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/samples/snippets/usage_guide.py b/samples/snippets/usage_guide.py index b28d10980..0ba6aef48 100644 --- a/samples/snippets/usage_guide.py +++ b/samples/snippets/usage_guide.py @@ -264,13 +264,19 @@ def _sink_pubsub_setup(client): ) # API call # [END sink_topic_permissions] - return topic + # create callback wrapper to delete topic when done + class TopicDeleter(): + def delete(self): + client.delete_topic(request={"topic":topic_path}) + + return topic, TopicDeleter() @snippet def sink_pubsub(client, to_delete): """Sink log entries to pubsub.""" - topic = _sink_pubsub_setup(client) + topic, topic_deleter = _sink_pubsub_setup(client) + to_delete.append(topic_deleter) sink_name = "robots-pubsub-%d" % (_millis(),) filter_str = "logName:apache-access AND textPayload:robot" updated_filter = "textPayload:robot" @@ -282,6 +288,7 @@ def sink_pubsub(client, to_delete): sink.create() # API call assert sink.exists() # API call # [END sink_pubsub_create] + to_delete.append(sink) created_sink = sink # [START client_list_sinks] From bddee2e0d686072ab828f9b15c416d39ad79f205 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Tue, 15 Jun 2021 15:28:22 -0700 Subject: [PATCH 2/2] fixed lint issue --- samples/snippets/usage_guide.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/snippets/usage_guide.py b/samples/snippets/usage_guide.py index 0ba6aef48..c931ed167 100644 --- a/samples/snippets/usage_guide.py +++ b/samples/snippets/usage_guide.py @@ -265,9 +265,9 @@ def _sink_pubsub_setup(client): # [END sink_topic_permissions] # create callback wrapper to delete topic when done - class TopicDeleter(): + class TopicDeleter: def delete(self): - client.delete_topic(request={"topic":topic_path}) + client.delete_topic(request={"topic": topic_path}) return topic, TopicDeleter()