From d09fcf398e09fb8970214fcbc684de5aa1c69125 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Mon, 20 Oct 2014 18:51:18 +0100 Subject: [PATCH] Unittest - Adjust failing tests due to split of streams --- test/bug.360.t | 8 ++++---- test/default.command.t | 2 +- test/filter-empty.t | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/bug.360.t b/test/bug.360.t index 1faa5d620..1b6f336ba 100755 --- a/test/bug.360.t +++ b/test/bug.360.t @@ -59,7 +59,7 @@ class TestBug360RemovalError(BaseTestBug360): expected = "Modified 2 tasks." self.assertIn(expected, out) expected = "You cannot remove the recurrence from a recurring task." - self.assertNotIn(expected, out) + self.assertNotIn(expected, err) def test_cannot_remove_recurrence(self): """Cannot remove recurrence from recurring task @@ -73,7 +73,7 @@ class TestBug360RemovalError(BaseTestBug360): self.assertEqual(code, 2) expected = "You cannot remove the recurrence from a recurring task." - self.assertIn(expected, out) + self.assertIn(expected, err) def test_cannot_remove_due_date(self): """Cannot remove due date from recurring task @@ -87,7 +87,7 @@ class TestBug360RemovalError(BaseTestBug360): self.assertEqual(code, 2) expected = "You cannot remove the due date from a recurring task." - self.assertIn(expected, out) + self.assertIn(expected, err) class TestBug360AllowedChanges(BaseTestBug360): @@ -117,7 +117,7 @@ class TestBug360AllowedChanges(BaseTestBug360): expected = "Modified 1 task." self.assertIn(expected, out) expected = "You cannot remove the due date from a recurring task." - self.assertNotIn(expected, out) + self.assertNotIn(expected, err) # Make sure no duplicate tasks were created args = ("diag",) diff --git a/test/default.command.t b/test/default.command.t index 0d2766ede..576d0049d 100755 --- a/test/default.command.t +++ b/test/default.command.t @@ -23,7 +23,7 @@ class TestCMD(TestCase): def test_default_command(self): """default command""" code, out, err = self.t(()) - self.assertIn("task list]", out) + self.assertIn("task list]", err) def test_info_command(self): """info command""" diff --git a/test/filter-empty.t b/test/filter-empty.t index 86db7dfe8..61bb7a99b 100755 --- a/test/filter-empty.t +++ b/test/filter-empty.t @@ -19,7 +19,7 @@ class TestEmptyFilter(TestCase): self.t(("add", "bar")) code, out, err = self.t.runError(("modify", "rc.allow.empty.filter=yes", "rc.confirmation=no", "priority:H")) - self.assertIn("Command prevented from running.", out) + self.assertIn("Command prevented from running.", err) def test_empty_filter_error(self): """Modify tasks with no filter, and disallowed confirmation.""" @@ -28,7 +28,7 @@ class TestEmptyFilter(TestCase): self.t(("add", "bar")) code, out, err = self.t.runError(("modify", "rc.allow.empty.filter=no", "priority:H")) - self.assertIn("You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken.", out) + self.assertIn("You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken.", err) if __name__ == "__main__": from simpletap import TAPTestRunner