openstack
/
ironic-python-agent
Code Issues Proposed changes

Merge "Set modification time in tarfile of ramdisk logs"

This commit is contained in:
Jenkins 2016-04-08 12:41:28 +00:00 committed by Gerrit Code Review
parent 6d8eaac8e3 3f715a20fd
commit 2d8e139f03
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ironic_python_agent/inspector.py
View File

@ -324,6 +324,7 @@ def collect_logs(data, failures):
with tarfile.open(fileobj=fp, mode='w:gz') as tar:
tarinfo = tarfile.TarInfo('journal')
tarinfo.size = len(out)
tarinfo.mtime = time.time()
tar.addfile(tarinfo, journal)
fp.seek(0)

7
ironic_python_agent/tests/unit/test_inspector.py
View File

@ -391,12 +391,13 @@ class TestCollectLogs(unittest.TestCase):
mock_execute.return_value = (contents, '')
data = {}
inspector.collect_logs(data, None)
with mock.patch('time.time', return_value=42):
inspector.collect_logs(data, None)
res = io.BytesIO(base64.b64decode(data['logs']))
with tarfile.open(fileobj=res) as tar:
members = [(m.name, m.size) for m in tar]
self.assertEqual([('journal', len(contents))], members)
members = [(m.name, m.size, m.mtime) for m in tar]
self.assertEqual([('journal', len(contents), 42)], members)
member = tar.extractfile('journal')
self.assertEqual(expected_contents, member.read().decode('utf-8'))