X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0b2a6fedb1a3e03a7c8173331f8ebcca1ca4a125..c6c2f3518bc745eed95b5f5b81db5d17db4366ff:/tools/crunchstat-summary/tests/test_examples.py?ds=sidebyside diff --git a/tools/crunchstat-summary/tests/test_examples.py b/tools/crunchstat-summary/tests/test_examples.py index c25a908118..fb23eab39e 100644 --- a/tools/crunchstat-summary/tests/test_examples.py +++ b/tools/crunchstat-summary/tests/test_examples.py @@ -11,6 +11,7 @@ import gzip from io import open import mock import os +import sys import unittest from crunchstat_summary.command import UTF8Decode @@ -21,7 +22,8 @@ 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, encoding='utf-8').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='(expected)'): @@ -52,7 +54,11 @@ 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): @@ -61,29 +67,37 @@ class SummarizeEdgeCases(unittest.TestCase): s.run() -class SummarizeContainer(ReportDiff): +class SummarizeContainerCommon(ReportDiff): fake_container = { 'uuid': '9tee4-dz642-lymtndkpy39eibk', 'created_at': '2017-08-18T14:27:25.371388141', 'log': '9tee4-4zz18-ihyzym9tcwjwg4r', } fake_request = { - 'uuid': '9tee4-xvhdp-uper95jktm10d3w', + 'uuid': '9tee4-xvhdp-kk0ja1cl8b2kr1y', 'name': 'container', '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') + 'runtime_constraints': { + 'vcpus': 1, + 'ram': 2621440000 + }, + 'log_uuid' : '9tee4-4zz18-m2swj50nk0r8b6y' + } + logfile = os.path.join( - TESTS_DIR, 'container_9tee4-dz642-lymtndkpy39eibk-crunchstat.txt.gz') + TESTS_DIR, 'container_request_9tee4-xvhdp-kk0ja1cl8b2kr1y-crunchstat.txt.gz') arvmountlog = os.path.join( - TESTS_DIR, 'container_9tee4-dz642-lymtndkpy39eibk-arv-mount.txt.gz') + TESTS_DIR, 'container_request_9tee4-xvhdp-kk0ja1cl8b2kr1y-arv-mount.txt.gz') @mock.patch('arvados.collection.CollectionReader') @mock.patch('arvados.api') - def test_container(self, mock_api, mock_cr): - mock_api().container_requests().index().execute.return_value = {'items':[]} + def check_common(self, mock_api, mock_cr): + items = [ {'items':[self.fake_request]}] + [{'items':[]}] * 100 + # Index and list mean the same thing, but are used in different places in the + # code. It's fragile, but exploit that fact to distinguish the two uses. + mock_api().container_requests().index().execute.return_value = {'items': [] } # child_crs + mock_api().container_requests().list().execute.side_effect = items # parent request mock_api().container_requests().get().execute.return_value = self.fake_request mock_api().containers().get().execute.return_value = self.fake_container mock_cr().__iter__.return_value = [ @@ -96,12 +110,31 @@ class SummarizeContainer(ReportDiff): return UTF8Decode(gzip.open(self.arvmountlog)) mock_cr().open.side_effect = _open args = crunchstat_summary.command.ArgumentParser().parse_args( - ['--job', self.fake_request['uuid']]) + self.arg_strings) cmd = crunchstat_summary.command.Command(args) cmd.run() self.diff_known_report(self.reportfile, cmd) + +class SummarizeContainer(SummarizeContainerCommon): + uuid = '9tee4-dz642-lymtndkpy39eibk' + reportfile = os.path.join(TESTS_DIR, 'container_%s.txt.gz' % uuid) + arg_strings = ['--container', uuid, '-v', '-v'] + + def test_container(self): + self.check_common() + + +class SummarizeContainerRequest(SummarizeContainerCommon): + uuid = '9tee4-xvhdp-kk0ja1cl8b2kr1y' + reportfile = os.path.join(TESTS_DIR, 'container_request_%s.txt.gz' % uuid) + arg_strings = ['--container-request', uuid, '-v', '-v'] + + def test_container_request(self): + self.check_common() + + class SummarizeJob(ReportDiff): fake_job_uuid = '4xphq-8i9sb-jq0ekny1xou3zoh' fake_log_id = 'fake-log-collection-id' @@ -183,9 +216,8 @@ class SummarizePipeline(ReportDiff): cmd = crunchstat_summary.command.Command(args) cmd.run() - job_report = [ - line for line in open(logfile+'.report', encoding='utf-8').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'] + @@ -259,9 +291,8 @@ class SummarizeACRJob(ReportDiff): cmd = crunchstat_summary.command.Command(args) cmd.run() - job_report = [ - line for line in open(logfile+'.report', encoding='utf-8').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',