Merge pull request #798 from ldoktor/fail2err

examples.tests: Rename failtest_nasty* to errortest_nasty*

examples/tests/failtest_nasty.py → examples/tests/errortest_nasty.py

@@ -23,7 +23,7 @@ class FailTest(Test):
 
     def test(self):
         """
-        Should fail not-that-badly
+        Avocado should report this as TestError.
         """
         raise NastyException("Nasty-string-like-exception")
 

examples/tests/failtest_nasty2.py → examples/tests/errortest_nasty2.py

@@ -23,7 +23,7 @@ class FailTest(Test):
 
     def test(self):
         """
-        Should fail.
+        Avocado should report this as TestError.
         """
         raise NastyException(None)  # str(Exception) fails!
 

examples/tests/failtest_nasty3.py → examples/tests/errortest_nasty3.py

@@ -23,7 +23,7 @@ class FailTest(Test):
 
     def test(self):
         """
-        Should fail not-that-badly
+        Avocado should report this as TestError.
         """
         raise NastyException("Nasty-string-like-exception")
 

selftests/functional/test_standalone.py

@@ -45,28 +45,28 @@ class StandaloneTests(unittest.TestCase):
         expected_rc = 1
         self.run_and_check(cmd_line, expected_rc, 'failtest')
 
-    def test_failtest_nasty(self):
-        cmd_line = './examples/tests/failtest_nasty.py -r'
+    def test_errortest_nasty(self):
+        cmd_line = './examples/tests/errortest_nasty.py -r'
         expected_rc = 1
-        result = self.run_and_check(cmd_line, expected_rc, 'failtest_nasty')
+        result = self.run_and_check(cmd_line, expected_rc, 'errortest_nasty')
         exc = "NastyException: Nasty-string-like-exception"
         count = result.stdout.count("\n%s" % exc)
         self.assertEqual(count, 2, "Exception \\n%s should be present twice in"
                          "the log (once from the log, second time when parsing"
                          "exception details." % (exc))
 
-    def test_failtest_nasty2(self):
-        cmd_line = './examples/tests/failtest_nasty2.py -r'
+    def test_errortest_nasty2(self):
+        cmd_line = './examples/tests/errortest_nasty2.py -r'
         expected_rc = 1
-        result = self.run_and_check(cmd_line, expected_rc, 'failtest_nasty2')
+        result = self.run_and_check(cmd_line, expected_rc, 'errortest_nasty2')
         self.assertIn("Exception: Unable to get exception, check the traceback"
                       " for details.", result.stdout)
 
-    def test_failtest_nasty3(self):
-        cmd_line = './examples/tests/failtest_nasty3.py -r'
+    def test_errortest_nasty3(self):
+        cmd_line = './examples/tests/errortest_nasty3.py -r'
         expected_rc = 1
-        result = self.run_and_check(cmd_line, expected_rc, 'failtest_nasty3')
-        self.assertIn("TestError: <failtest_nasty3.NastyException instance at ",
+        result = self.run_and_check(cmd_line, expected_rc, 'errortest_nasty3')
+        self.assertIn("TestError: <errortest_nasty3.NastyException instance at ",
                       result.stdout)
 
     def test_errortest(self):