diff --git a/tests/json/test_output.py b/tests/json/test_output.py index 3d0d896..f1fd48b 100644 --- a/tests/json/test_output.py +++ b/tests/json/test_output.py @@ -26,7 +26,8 @@ class TestValidJson(unittest.TestCase): of runs that didn't succeed. """ - def iter_test_files(self): + @staticmethod + def iter_test_files(): """ Iterate over all test files in DATA_BASE_DIR """ for dirpath, _, filenames in os.walk(DATA_BASE_DIR): for filename in filenames: @@ -34,7 +35,6 @@ class TestValidJson(unittest.TestCase): def run_and_parse(self, program, args, print_output=False, check_return_code=True): """ run single program with single file and parse output """ - return_code = None with OutputCapture() as capturer: # capture stdout try: return_code = program(args) diff --git a/tests/rtfobj/test_is_rtf.py b/tests/rtfobj/test_is_rtf.py index 43ea40f..ff6f927 100644 --- a/tests/rtfobj/test_is_rtf.py +++ b/tests/rtfobj/test_is_rtf.py @@ -60,8 +60,8 @@ class TestIsRtf(unittest.TestCase): .format(full_path, expect)) with open(full_path, 'rb') as handle: self.assertEqual(is_rtf(handle), expect, - 'is_rtf(open({0})) did not return {1}' - .format(full_path, expect)) + 'is_rtf(open({0})) did not return {1}' + .format(full_path, expect)) # just in case somebody calls this file as a script