zuul/zuul-jobs
Code Issues Proposed changes

htmlify: fix py3 gzip issue

Browse Source 
Actually test the gzip path, and correct a bytes/str issue under
python3 (the file should be opened as text).

Change-Id: Icc5362d3d020761e07e60fb8ee296c98a8fe3ac4
This commit is contained in:
James E. Blair 2018-08-17 13:12:39 -07:00
parent 3b6429938b
commit 15ba4de7e6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/htmlify-logs/library/htmlify.py
View File

@ -85,8 +85,8 @@ highlight_by_hash();
def run(inpath, outpath): def run(inpath, outpath):
if inpath.endswith('.gz'): if inpath.endswith('.gz'):
infile = gzip.open(inpath, 'r') infile = gzip.open(inpath, 'rt')
outfile = gzip.open(outpath, 'w') outfile = gzip.open(outpath, 'wt')
else: else:
infile = open(inpath, 'r') infile = open(inpath, 'r')
outfile = open(outpath, 'w') outfile = open(outpath, 'w')

7
roles/htmlify-logs/library/test_htmlify.py
View File

@ -28,9 +28,9 @@ FIXTURE_DIR = os.path.join(os.path.dirname(__file__),
class TestHTMLify(testtools.TestCase): class TestHTMLify(testtools.TestCase):
def _test_file(self, fn): def _test_file(self, fn, ref_fn):
in_path = os.path.join(FIXTURE_DIR, 'in', fn) in_path = os.path.join(FIXTURE_DIR, 'in', fn)
ref_path = os.path.join(FIXTURE_DIR, 'reference', fn) ref_path = os.path.join(FIXTURE_DIR, 'reference', ref_fn)
out_root = self.useFixture(fixtures.TempDir()).path out_root = self.useFixture(fixtures.TempDir()).path
out_path = os.path.join(out_root, fn) out_path = os.path.join(out_root, fn)
run(in_path, out_path) run(in_path, out_path)
@ -45,4 +45,5 @@ class TestHTMLify(testtools.TestCase):
self.assertEqual(reference_data, generated_data) self.assertEqual(reference_data, generated_data)
def test_htmlify(self): def test_htmlify(self):
self._test_file('job-output.txt') self._test_file('job-output.txt', 'job-output.txt')
self._test_file('job-output.txt.gz', 'job-output.txt')