diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scanner/annotationparser/test_parser.py | 3 | ||||
| -rw-r--r-- | tests/warn/warningtester.py | 16 |
2 files changed, 11 insertions, 8 deletions
diff --git a/tests/scanner/annotationparser/test_parser.py b/tests/scanner/annotationparser/test_parser.py index a1c5866c..ce3ccd22 100644 --- a/tests/scanner/annotationparser/test_parser.py +++ b/tests/scanner/annotationparser/test_parser.py @@ -108,7 +108,7 @@ def parsed2tree(docblock): parsed += ' <annotations>\n' for key, value in tag.options.values: parsed += ' <annotation>\n' - parsed += ' <name>%s</name>\n' %(key, ) + parsed += ' <name>%s</name>\n' % (key, ) if value is not None: options = value.all() parsed += ' <options>\n' @@ -130,6 +130,7 @@ def parsed2tree(docblock): return parsed + def expected2tree(docblock): # Note: this sucks, but we can't rely on etree.tostring() to generate useable output :( diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py index 27e0a5e6..fc3c3d2d 100644 --- a/tests/warn/warningtester.py +++ b/tests/warn/warningtester.py @@ -61,23 +61,24 @@ def _diff(a, b): for line in a[i1:i2]: for l in line.split('\n'): if l != '': - retval += ' ' + l + '\n' + retval += ' ' + l + '\n' continue if tag in ('replace', 'delete'): for line in a[i1:i2]: for l in line.split('\n'): if l != '': - retval += '-' + l + '\n' + retval += '-' + l + '\n' if tag in ('replace', 'insert'): for line in b[j1:j2]: for l in line.split('\n'): if l != '': - retval += '+' + l + '\n' + retval += '+' + l + '\n' return retval + def _extract_expected(filename): fd = open(filename, 'rU') data = fd.read() @@ -92,6 +93,7 @@ def _extract_expected(filename): return retval + def check(args): filename = args[0] @@ -133,10 +135,10 @@ def check(args): if len(expected_warnings) != len(emitted_warnings): raise SystemExit('ERROR in %r: %d warnings were emitted, ' - 'expected %d:\n%s' %(os.path.basename(filename), - len(emitted_warnings), - len(expected_warnings), - _diff(expected_warnings, emitted_warnings))) + 'expected %d:\n%s' % (os.path.basename(filename), + len(emitted_warnings), + len(expected_warnings), + _diff(expected_warnings, emitted_warnings))) for emitted_warning, expected_warning in zip(emitted_warnings, expected_warnings): if expected_warning != emitted_warning: |