openstack
/
oslo.reports
Code Issues Proposed changes

Merge "Remove timeutils.strtime() usage"

This commit is contained in:
Jenkins 2015-05-12 20:12:20 +00:00 committed by Gerrit Code Review
parent 91d918ab2f 5b7629dba0
commit 29d2b4c82e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack/common/report/guru_meditation_report.py
View File

@ -157,7 +157,8 @@ class GuruMeditation(object):
service_name = service_name or os.path.basename(
inspect.stack()[-1][1])
filename = "%s_gurumeditation_%s" % (
service_name, timeutils.strtime(fmt=cls.timestamp_fmt))
service_name, timeutils.utcnow().strftime(
cls.timestamp_fmt))
filepath = os.path.join(log_dir, filename)
try:
with open(filepath, "w") as dumpfile:

6
tests/unit/reports/test_guru_meditation_report.py
View File

@ -14,6 +14,7 @@
from __future__ import print_function
import datetime
import os
import re
import signal
@ -167,7 +168,8 @@ class TestGuruMeditationReport(base.BaseTestCase):
os.kill(os.getpid(), signal.SIGUSR1)
self.assertIn('Guru Meditation', sys.stderr.getvalue())
@mock.patch('oslo_utils.timeutils.strtime', return_value="NOW")
@mock.patch('oslo_utils.timeutils.utcnow',
return_value=datetime.datetime(2014, 1, 1, 12, 0, 0))
def test_register_autorun_log_dir(self, mock_strtime):
log_dir = self.useFixture(fixtures.TempDir()).path
gmr.TextGuruMeditation.setup_autorun(
@ -175,7 +177,7 @@ class TestGuruMeditationReport(base.BaseTestCase):
os.kill(os.getpid(), signal.SIGUSR1)
with open(os.path.join(
log_dir, "fake-service_gurumeditation_NOW")) as df:
log_dir, "fake-service_gurumeditation_20140101120000")) as df:
self.assertIn('Guru Meditation', df.read())
def tearDown(self):