@@ -231,9 +231,10 @@ def test_log_struct(self):
231231 def test_log_handler_async (self ):
232232 LOG_MESSAGE = 'It was the worst of times'
233233
234- handler = CloudLoggingHandler (Config .CLIENT )
234+ handler_name = 'gcp-async' + unique_resource_id ('-' )
235+ handler = CloudLoggingHandler (Config .CLIENT , name = handler_name )
235236 # only create the logger to delete, hidden otherwise
236- logger = Config .CLIENT .logger (handler . name )
237+ logger = Config .CLIENT .logger (handler_name )
237238 self .to_delete .append (logger )
238239
239240 cloud_logger = logging .getLogger (handler .name )
@@ -334,14 +335,14 @@ def test_list_metrics(self):
334335 METRIC_NAME , DEFAULT_FILTER , DEFAULT_DESCRIPTION )
335336 self .assertFalse (metric .exists ())
336337 before_metrics = list (Config .CLIENT .list_metrics ())
337- before_names = set (metric .name for metric in before_metrics )
338+ before_names = set (before .name for before in before_metrics )
339+ self .failIf (metric .name in before_names )
338340 metric .create ()
339341 self .to_delete .append (metric )
340342 self .assertTrue (metric .exists ())
341343 after_metrics = list (Config .CLIENT .list_metrics ())
342- after_names = set (metric .name for metric in after_metrics )
343- self .assertEqual (after_names - before_names ,
344- set ([METRIC_NAME ]))
344+ after_names = set (after .name for after in after_metrics )
345+ self .assertTrue (metric .name in after_names )
345346
346347 def test_reload_metric (self ):
347348 METRIC_NAME = 'test-reload-metric%s' % (_RESOURCE_ID ,)
@@ -472,14 +473,14 @@ def test_list_sinks(self):
472473 sink = Config .CLIENT .sink (SINK_NAME , DEFAULT_FILTER , uri )
473474 self .assertFalse (sink .exists ())
474475 before_sinks = list (Config .CLIENT .list_sinks ())
475- before_names = set (sink .name for sink in before_sinks )
476+ before_names = set (before .name for before in before_sinks )
477+ self .failIf (sink .name in before_names )
476478 sink .create ()
477479 self .to_delete .append (sink )
478480 self .assertTrue (sink .exists ())
479481 after_sinks = list (Config .CLIENT .list_sinks ())
480- after_names = set (sink .name for sink in after_sinks )
481- self .assertEqual (after_names - before_names ,
482- set ([SINK_NAME ]))
482+ after_names = set (after .name for after in after_sinks )
483+ self .assertTrue (sink .name in after_names )
483484
484485 def test_reload_sink (self ):
485486 SINK_NAME = 'test-reload-sink%s' % (_RESOURCE_ID ,)
0 commit comments