From 6fe692b26da0591d88ac43cfb56a39ec4984c5c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= Date: Fri, 18 Sep 2015 09:42:42 +0200 Subject: [PATCH] examples.tests: Rename failtest_nasty* to errortest_nasty* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The name was not correct as the test should error-out. Signed-off-by: Lukáš Doktor --- .../{failtest_nasty.py => errortest_nasty.py} | 2 +- ...failtest_nasty2.py => errortest_nasty2.py} | 2 +- ...failtest_nasty3.py => errortest_nasty3.py} | 2 +- selftests/functional/test_standalone.py | 20 +++++++++---------- 4 files changed, 13 insertions(+), 13 deletions(-) rename examples/tests/{failtest_nasty.py => errortest_nasty.py} (90%) rename examples/tests/{failtest_nasty2.py => errortest_nasty2.py} (90%) rename examples/tests/{failtest_nasty3.py => errortest_nasty3.py} (91%) diff --git a/examples/tests/failtest_nasty.py b/examples/tests/errortest_nasty.py similarity index 90% rename from examples/tests/failtest_nasty.py rename to examples/tests/errortest_nasty.py index c43b45ee..4da465d9 100755 --- a/examples/tests/failtest_nasty.py +++ b/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") diff --git a/examples/tests/failtest_nasty2.py b/examples/tests/errortest_nasty2.py similarity index 90% rename from examples/tests/failtest_nasty2.py rename to examples/tests/errortest_nasty2.py index 6d2e3898..6ad79f6d 100755 --- a/examples/tests/failtest_nasty2.py +++ b/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! diff --git a/examples/tests/failtest_nasty3.py b/examples/tests/errortest_nasty3.py similarity index 91% rename from examples/tests/failtest_nasty3.py rename to examples/tests/errortest_nasty3.py index b698f923..2350caee 100755 --- a/examples/tests/failtest_nasty3.py +++ b/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") diff --git a/selftests/functional/test_standalone.py b/selftests/functional/test_standalone.py index d1363400..e7ee013a 100644 --- a/selftests/functional/test_standalone.py +++ b/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: