X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9aff8a3624b463d3fd4d9302c4d41c7558df4a13..2cf4ea4fe0e1eda66d510983bf27fb9836af5ff4:/tools/crunchstat-summary/tests/test_examples.py diff --git a/tools/crunchstat-summary/tests/test_examples.py b/tools/crunchstat-summary/tests/test_examples.py index 6271f5665c..7603ea488c 100644 --- a/tools/crunchstat-summary/tests/test_examples.py +++ b/tools/crunchstat-summary/tests/test_examples.py @@ -8,20 +8,25 @@ import crunchstat_summary.command import difflib import glob import gzip +from io import open import mock import os +import sys import unittest +from crunchstat_summary.command import UTF8Decode + TESTS_DIR = os.path.dirname(os.path.abspath(__file__)) class ReportDiff(unittest.TestCase): def diff_known_report(self, logfile, cmd): expectfile = logfile+'.report' - expect = open(expectfile).readlines() + with open(expectfile, encoding='utf-8') as f: + expect = f.readlines() self.diff_report(cmd, expect, expectfile=expectfile) - def diff_report(self, cmd, expect, expectfile=None): + def diff_report(self, cmd, expect, expectfile='(expected)'): got = [x+"\n" for x in cmd.report().strip("\n").split("\n")] self.assertEqual(got, expect, "\n"+"".join(difflib.context_diff( expect, got, fromfile=expectfile, tofile="(generated)"))) @@ -49,19 +54,22 @@ class HTMLFromFile(ReportDiff): ['--format=html', '--log-file', logfile]) cmd = crunchstat_summary.command.Command(args) cmd.run() - self.assertRegexpMatches(cmd.report(), r'(?is).*\s*$') + if sys.version_info >= (3,2): + self.assertRegex(cmd.report(), r'(?is).*\s*$') + else: + self.assertRegexpMatches(cmd.report(), r'(?is).*\s*$') class SummarizeEdgeCases(unittest.TestCase): def test_error_messages(self): - logfile = open(os.path.join(TESTS_DIR, 'crunchstat_error_messages.txt')) + logfile = open(os.path.join(TESTS_DIR, 'crunchstat_error_messages.txt'), encoding='utf-8') s = crunchstat_summary.summarizer.Summarizer(logfile) s.run() class SummarizeContainer(ReportDiff): fake_container = { - 'uuid': '9tee4-dz642-mjfb0i5hzojp16a', + 'uuid': '9tee4-dz642-lymtndkpy39eibk', 'created_at': '2017-08-18T14:27:25.371388141', 'log': '9tee4-4zz18-ihyzym9tcwjwg4r', } @@ -71,8 +79,12 @@ class SummarizeContainer(ReportDiff): 'created_at': '2017-08-18T14:27:25.242339223Z', 'container_uuid': fake_container['uuid'], } + reportfile = os.path.join( + TESTS_DIR, 'container_9tee4-dz642-lymtndkpy39eibk.txt.gz') logfile = os.path.join( - TESTS_DIR, 'container_9tee4-dz642-mjfb0i5hzojp16a-crunchstat.txt.gz') + TESTS_DIR, 'container_9tee4-dz642-lymtndkpy39eibk-crunchstat.txt.gz') + arvmountlog = os.path.join( + TESTS_DIR, 'container_9tee4-dz642-lymtndkpy39eibk-arv-mount.txt.gz') @mock.patch('arvados.collection.CollectionReader') @mock.patch('arvados.api') @@ -82,13 +94,18 @@ class SummarizeContainer(ReportDiff): mock_api().containers().get().execute.return_value = self.fake_container mock_cr().__iter__.return_value = [ 'crunch-run.txt', 'stderr.txt', 'node-info.txt', - 'container.json', 'crunchstat.txt'] - mock_cr().open.return_value = gzip.open(self.logfile) + 'container.json', 'crunchstat.txt', 'arv-mount.txt'] + def _open(n): + if n == "crunchstat.txt": + return UTF8Decode(gzip.open(self.logfile)) + elif n == "arv-mount.txt": + return UTF8Decode(gzip.open(self.arvmountlog)) + mock_cr().open.side_effect = _open args = crunchstat_summary.command.ArgumentParser().parse_args( ['--job', self.fake_request['uuid']]) cmd = crunchstat_summary.command.Command(args) cmd.run() - self.diff_known_report(self.logfile, cmd) + self.diff_known_report(self.reportfile, cmd) class SummarizeJob(ReportDiff): @@ -105,7 +122,7 @@ class SummarizeJob(ReportDiff): def test_job_report(self, mock_api, mock_cr): mock_api().jobs().get().execute.return_value = self.fake_job mock_cr().__iter__.return_value = ['fake-logfile.txt'] - mock_cr().open.return_value = gzip.open(self.logfile) + mock_cr().open.return_value = UTF8Decode(gzip.open(self.logfile)) args = crunchstat_summary.command.ArgumentParser().parse_args( ['--job', self.fake_job_uuid]) cmd = crunchstat_summary.command.Command(args) @@ -166,15 +183,14 @@ class SummarizePipeline(ReportDiff): mock_api().pipeline_instances().get().execute. \ return_value = self.fake_instance mock_cr().__iter__.return_value = ['fake-logfile.txt'] - mock_cr().open.side_effect = [gzip.open(logfile) for _ in range(3)] + mock_cr().open.side_effect = [UTF8Decode(gzip.open(logfile)) for _ in range(3)] args = crunchstat_summary.command.ArgumentParser().parse_args( ['--pipeline-instance', self.fake_instance['uuid']]) cmd = crunchstat_summary.command.Command(args) cmd.run() - job_report = [ - line for line in open(logfile+'.report').readlines() - if not line.startswith('#!! ')] + with open(logfile+'.report', encoding='utf-8') as f: + job_report = [line for line in f if not line.startswith('#!! ')] expect = ( ['### Summary for foo (zzzzz-8i9sb-000000000000000)\n'] + job_report + ['\n'] + @@ -242,15 +258,14 @@ class SummarizeACRJob(ReportDiff): mock_api().jobs().index().execute.return_value = self.fake_jobs_index mock_api().jobs().get().execute.return_value = self.fake_job mock_cr().__iter__.return_value = ['fake-logfile.txt'] - mock_cr().open.side_effect = [gzip.open(logfile) for _ in range(3)] + mock_cr().open.side_effect = [UTF8Decode(gzip.open(logfile)) for _ in range(3)] args = crunchstat_summary.command.ArgumentParser().parse_args( ['--job', self.fake_job['uuid']]) cmd = crunchstat_summary.command.Command(args) cmd.run() - job_report = [ - line for line in open(logfile+'.report').readlines() - if not line.startswith('#!! ')] + with open(logfile+'.report', encoding='utf-8') as f: + job_report = [line for line in f if not line.startswith('#!! ')] expect = ( ['### Summary for zzzzz-8i9sb-i3e77t9z5y8j9cc (partial) (zzzzz-8i9sb-i3e77t9z5y8j9cc)\n', '(no report generated)\n',