Skip to content

Commit

Permalink
Merge pull request #1677 from tseaver/logging-system_tests-avoid_reus…
Browse files Browse the repository at this point in the history
…ing_logger_name

Avoid reusing logger name in logging system tests
  • Loading branch information
tseaver committed Mar 30, 2016
2 parents 81be985 + 660441d commit 9a7df6f
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions system_tests/logging_.py
Expand Up @@ -22,7 +22,6 @@


_MILLIS = 1000 * time.time()
DEFAULT_LOGGER_NAME = 'system-tests-logger-%d' % (_MILLIS,)
DEFAULT_METRIC_NAME = 'system-tests-metric-%d' % (_MILLIS,)
DEFAULT_SINK_NAME = 'system-tests-sink-%d' % (_MILLIS,)
DEFAULT_FILTER = 'logName:syslog AND severity>=INFO'
Expand Down Expand Up @@ -54,9 +53,14 @@ def tearDown(self):
for doomed in self.to_delete:
doomed.delete()

@staticmethod
def _logger_name():
_millis = 1000 * time.time()
return 'system-tests-logger-%d' % (_millis,)

def test_log_text(self):
TEXT_PAYLOAD = 'System test: test_log_text'
logger = Config.CLIENT.logger(DEFAULT_LOGGER_NAME)
logger = Config.CLIENT.logger(self._logger_name())
self.to_delete.append(logger)
logger.log_text(TEXT_PAYLOAD)
time.sleep(2)
Expand All @@ -69,7 +73,7 @@ def test_log_struct(self):
'message': 'System test: test_log_struct',
'weather': 'partly cloudy',
}
logger = Config.CLIENT.logger(DEFAULT_LOGGER_NAME)
logger = Config.CLIENT.logger(self._logger_name())
self.to_delete.append(logger)
logger.log_struct(JSON_PAYLOAD)
time.sleep(2)
Expand Down

0 comments on commit 9a7df6f

Please sign in to comment.