summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Collins <robertc@robertcollins.net>2008-12-10 09:24:56 +1100
committerRobert Collins <robertc@robertcollins.net>2008-12-10 09:24:56 +1100
commit4bf57d56ccd503e13abad3ef2b668df077a841de (patch)
treef9d94faf5e2cb7735c6e17fc886e7b87aaf5dbd8
parent8798598cdca654c5ade3029fac97691c98d0a101 (diff)
downloadsubunit-git-4bf57d56ccd503e13abad3ef2b668df077a841de.tar.gz
fail->failure for tap2subunit
-rw-r--r--python/subunit/__init__.py2
-rw-r--r--python/subunit/tests/test_tap2subunit.py18
2 files changed, 10 insertions, 10 deletions
diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py
index 1322248..2ad56a8 100644
--- a/python/subunit/__init__.py
+++ b/python/subunit/__init__.py
@@ -533,7 +533,7 @@ def TAP2SubUnit(tap, subunit):
if status == 'ok':
result = 'success'
else:
- result = 'fail'
+ result = "failure"
if description is None:
description = ''
else:
diff --git a/python/subunit/tests/test_tap2subunit.py b/python/subunit/tests/test_tap2subunit.py
index 7d26509..7e59985 100644
--- a/python/subunit/tests/test_tap2subunit.py
+++ b/python/subunit/tests/test_tap2subunit.py
@@ -222,7 +222,7 @@ class TestTAP2SubUnit(unittest.TestCase):
'test test 1 first test',
'success test 1 first test',
'test test 2 second test',
- 'fail test 2 second test',
+ 'failure test 2 second test',
'test test 3',
'error test 3 [',
'test missing from TAP output',
@@ -250,7 +250,7 @@ class TestTAP2SubUnit(unittest.TestCase):
'test missing from TAP output',
']',
'test test 3 third test',
- 'fail test 3 third test',
+ 'failure test 3 third test',
],
self.subunit.getvalue().splitlines())
@@ -272,7 +272,7 @@ class TestTAP2SubUnit(unittest.TestCase):
'test missing from TAP output',
']',
'test test 3 third test',
- 'fail test 3 third test',
+ 'failure test 3 third test',
],
self.subunit.getvalue().splitlines())
@@ -296,11 +296,11 @@ class TestTAP2SubUnit(unittest.TestCase):
'test test 1 - first test in a script with no plan at all',
'success test 1 - first test in a script with no plan at all',
'test test 2 - second',
- 'fail test 2 - second',
+ 'failure test 2 - second',
'test test 3 - third',
'success test 3 - third',
'test test 4 - fourth',
- 'fail test 4 - fourth'
+ 'failure test 4 - fourth'
],
self.subunit.getvalue().splitlines())
@@ -324,11 +324,11 @@ class TestTAP2SubUnit(unittest.TestCase):
'test test 1 - first test in a script with no plan at all',
'success test 1 - first test in a script with no plan at all',
'test test 2 - second',
- 'fail test 2 - second',
+ 'failure test 2 - second',
'test test 3 - third',
'success test 3 - third',
'test test 4 - fourth',
- 'fail test 4 - fourth'
+ 'failure test 4 - fourth'
],
self.subunit.getvalue().splitlines())
@@ -350,11 +350,11 @@ class TestTAP2SubUnit(unittest.TestCase):
'test test 1 - first test in a script with no plan at all',
'success test 1 - first test in a script with no plan at all',
'test test 2 - second',
- 'fail test 2 - second',
+ 'failure test 2 - second',
'test test 3 - third',
'success test 3 - third',
'test test 4 - fourth',
- 'fail test 4 - fourth'
+ 'failure test 4 - fourth'
],
self.subunit.getvalue().splitlines())