From 6724dd376615b80c36b3b1f693e3ea0cffb9514f Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 14 Aug 2015 09:13:10 -0400 Subject: [PATCH] Test: Reworked test to avoid faketime and self.t.runError --- test/recurrence.t | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/test/recurrence.t b/test/recurrence.t index 97cf3b366..79749d9ed 100755 --- a/test/recurrence.t +++ b/test/recurrence.t @@ -154,14 +154,11 @@ class TestRecurrenceUntil(TestCase): # Given that the original decision was arbitrary, this is no worse. # We shall preserve recent behavior. self.t.faketime("+24h") - code, out, err = self.t.runError("list rc.verbose:nothing") - self.assertEqual(out.count("one"), 0) - self.assertEqual(err.count("one"), 0) - - # NOTE - # 'faketime' prior to 0.9.6, fails to propagate exit codes. - # This causes the above 'self.t.runError' to exit with a 0. - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750721 + code, out, err = self.t("( status:pending or status:recurring ) count") + self.assertEqual("0\n", out) + self.assertIn("Task 2 'one' expired and was deleted.", err) + self.assertIn("Task 3 'one' expired and was deleted.", err) + self.assertIn("Task 4 'one' expired and was deleted.", err) class TestRecurrenceTasks(TestCase):