From bb38dc6687fab529151e41a471386f2a0e8a3360 Mon Sep 17 00:00:00 2001 From: Christian Herdtweck Date: Mon, 3 Jun 2019 10:52:15 +0200 Subject: [PATCH] tests: Check regular output, not json --- tests/msodde/test_basic.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/msodde/test_basic.py b/tests/msodde/test_basic.py index 4cb0b24..b1fa4e0 100644 --- a/tests/msodde/test_basic.py +++ b/tests/msodde/test_basic.py @@ -120,15 +120,11 @@ class TestErrorOutput(unittest.TestCase): for suffix in 'doc', 'docm', 'docx', 'ppt', 'pptm', 'pptx', 'xls', \ 'xlsb', 'xlsm', 'xlsx': example_file = join(BASE_DIR, 'encrypted', 'encrypted.' + suffix) - output, ret_code = call_and_capture('msodde', ['-j', example_file], + output, ret_code = call_and_capture('msodde', [example_file, ], accept_nonzero_exit=True) self.assertEqual(ret_code, 1) - data = json.loads(output, object_pairs_hook=OrderedDict) - # debug: json.dump(data, sys.stdout, indent=4) - self.assertTrue(all(part['type'] == 'msg' for part in data)) - self.assertTrue(any(part['level'] == 'ERROR' and - 'passwords could not decrypt' in part['msg'] - for part in data)) + self.assertIn('passwords could not decrypt office file', output, + msg='Unexpected output: {}'.format(output.strip())) class TestDdeLinks(unittest.TestCase): -- libgit2 0.21.4