Skip to content

Commit 9a7df6f

Browse files
committed
Merge pull request #1677 from tseaver/logging-system_tests-avoid_reusing_logger_name
Avoid reusing logger name in logging system tests
2 parents 81be985 + 660441d commit 9a7df6f

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

system_tests/logging_.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323

2424
_MILLIS = 1000 * time.time()
25-
DEFAULT_LOGGER_NAME = 'system-tests-logger-%d' % (_MILLIS,)
2625
DEFAULT_METRIC_NAME = 'system-tests-metric-%d' % (_MILLIS,)
2726
DEFAULT_SINK_NAME = 'system-tests-sink-%d' % (_MILLIS,)
2827
DEFAULT_FILTER = 'logName:syslog AND severity>=INFO'
@@ -54,9 +53,14 @@ def tearDown(self):
5453
for doomed in self.to_delete:
5554
doomed.delete()
5655

56+
@staticmethod
57+
def _logger_name():
58+
_millis = 1000 * time.time()
59+
return 'system-tests-logger-%d' % (_millis,)
60+
5761
def test_log_text(self):
5862
TEXT_PAYLOAD = 'System test: test_log_text'
59-
logger = Config.CLIENT.logger(DEFAULT_LOGGER_NAME)
63+
logger = Config.CLIENT.logger(self._logger_name())
6064
self.to_delete.append(logger)
6165
logger.log_text(TEXT_PAYLOAD)
6266
time.sleep(2)
@@ -69,7 +73,7 @@ def test_log_struct(self):
6973
'message': 'System test: test_log_struct',
7074
'weather': 'partly cloudy',
7175
}
72-
logger = Config.CLIENT.logger(DEFAULT_LOGGER_NAME)
76+
logger = Config.CLIENT.logger(self._logger_name())
7377
self.to_delete.append(logger)
7478
logger.log_struct(JSON_PAYLOAD)
7579
time.sleep(2)

0 commit comments

Comments
 (0)