From 8001de6960f517ed163a9c6023178384f9180bbe Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Mon, 11 Nov 2019 18:06:45 +0100 Subject: [PATCH] Scheduler: Use assertRegexp instead of assertNotRegexp in tests. It avoids self negatives. --- plugins/Scheduler/test.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/Scheduler/test.py b/plugins/Scheduler/test.py index bb6e595bc..ec91a6f53 100644 --- a/plugins/Scheduler/test.py +++ b/plugins/Scheduler/test.py @@ -41,7 +41,7 @@ class SchedulerTestCase(ChannelPluginTestCase): def testAddRemove(self): self.assertRegexp('scheduler list', 'no.*commands') m = self.assertNotError('scheduler add 5 echo testAddRemove') - self.assertNotRegexp('scheduler list', 'no.*commands') + self.assertRegexp('scheduler list', 'echo testAddRemove') timeFastForward(2) self.assertNoResponse(' ', timeout=1) timeFastForward(2) @@ -73,7 +73,8 @@ class SchedulerTestCase(ChannelPluginTestCase): self.assertNoResponse(' ', timeout=1) def testRepeat(self): - self.assertNotError('scheduler repeat repeater 5 echo testRepeat') + self.assertRegexp('scheduler repeat repeater 5 echo testRepeat', + 'testRepeat') timeFastForward(5) self.assertResponse(' ', 'testRepeat') self.assertResponse('scheduler list', 'repeater: "echo testRepeat"') @@ -82,12 +83,13 @@ class SchedulerTestCase(ChannelPluginTestCase): timeFastForward(2) self.assertResponse(' ', 'testRepeat') self.assertNotError('scheduler remove repeater') - self.assertNotRegexp('scheduler list', 'repeater') + self.assertRegexp('scheduler list', 'no.*commands') timeFastForward(5) self.assertNoResponse(' ', timeout=1) def testRepeatWorksWithNestedCommands(self): - self.assertNotError('scheduler repeat foo 5 "echo foo [echo nested]"') + self.assertRegexp('scheduler repeat foo 5 "echo foo [echo nested]"', + 'foo nested') timeFastForward(5) self.assertResponse(' ', 'foo nested') timeFastForward(3)