diff --git a/test/basetest/hooks.py b/test/basetest/hooks.py index 627f2f711..d97c3fc58 100644 --- a/test/basetest/hooks.py +++ b/test/basetest/hooks.py @@ -478,13 +478,6 @@ class LoggedHook(Hook): return newlog - def assertTriggered(self): - """Check if current hook file was triggered/used by taskwarrior - """ - log = self._parse_log() - - assert log["calls"], "{0} was never called".format(self.hookname) - def assertTriggeredCount(self, count): """Check if current hook file was triggered/used by taskwarrior and how many times. diff --git a/test/hooks.on-add.t b/test/hooks.on-add.t index 1642ad591..508548b37 100755 --- a/test/hooks.on-add.t +++ b/test/hooks.on-add.t @@ -50,7 +50,6 @@ class TestHooksOnAdd(TestCase): code, out, err = self.t(("add", "foo")) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) @@ -65,7 +64,6 @@ class TestHooksOnAdd(TestCase): code, out, err = self.t.runError(("add", "foo")) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(1) @@ -80,7 +78,6 @@ class TestHooksOnAdd(TestCase): code, out, err = self.t.runError(("add", "foo")) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(1) @@ -96,7 +93,6 @@ class TestHooksOnAdd(TestCase): self.assertIn("Hook Error: Expected 1 JSON task(s), found 0", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) @@ -109,7 +105,6 @@ class TestHooksOnAdd(TestCase): self.assertIn("Hook Error: Expected 1 JSON task(s), found 2", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) @@ -122,7 +117,6 @@ class TestHooksOnAdd(TestCase): self.assertIn("Hook Error: JSON must be for the same task:", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) @@ -138,7 +132,6 @@ class TestHooksOnAdd(TestCase): self.assertIn("Hook Error: JSON syntax error in: {\"}", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) hook.assertInvalidJSONOutput() @@ -155,7 +148,6 @@ class TestHooksOnAdd(TestCase): self.assertIn("Hook Error: JSON Object missing 'uuid' attribute.", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) diff --git a/test/hooks.on-exit.t b/test/hooks.on-exit.t index 24cddfea8..b88db75f5 100755 --- a/test/hooks.on-exit.t +++ b/test/hooks.on-exit.t @@ -51,7 +51,6 @@ class TestHooksOnExit(TestCase): self.assertIn("Taskwarrior", out) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) @@ -68,7 +67,6 @@ class TestHooksOnExit(TestCase): self.assertIn("Taskwarrior", out) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(1) @@ -85,7 +83,6 @@ class TestHooksOnExit(TestCase): self.assertIn("Taskwarrior", out) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) @@ -102,7 +99,6 @@ class TestHooksOnExit(TestCase): self.assertIn("Hook Error: Expected 0 JSON task(s), found 1", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) diff --git a/test/hooks.on-launch.t b/test/hooks.on-launch.t index 5721e6410..8d5542282 100755 --- a/test/hooks.on-launch.t +++ b/test/hooks.on-launch.t @@ -51,7 +51,6 @@ class TestHooksOnLaunch(TestCase): self.assertIn("Taskwarrior", out) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) @@ -68,7 +67,6 @@ class TestHooksOnLaunch(TestCase): self.assertNotIn("Taskwarrior", out) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(1) @@ -85,7 +83,6 @@ class TestHooksOnLaunch(TestCase): self.assertNotIn("Could not get Hook exit status!", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(137) @@ -102,7 +99,6 @@ class TestHooksOnLaunch(TestCase): self.assertIn("Hook Error: Expected 0 JSON task(s), found 1", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) diff --git a/test/hooks.on-modify.t b/test/hooks.on-modify.t index 26da130a3..f8087565e 100755 --- a/test/hooks.on-modify.t +++ b/test/hooks.on-modify.t @@ -51,7 +51,6 @@ class TestHooksOnModify(TestCase): code, out, err = self.t(("1", "modify", "+tag")) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) @@ -67,7 +66,6 @@ class TestHooksOnModify(TestCase): code, out, err = self.t.runError(("1", "modify", "+tag")) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(1) @@ -84,7 +82,6 @@ class TestHooksOnModify(TestCase): self.assertIn("Hook Error: Expected 1 JSON task(s), found 0", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) @@ -101,7 +98,6 @@ class TestHooksOnModify(TestCase): self.assertIn("Hook Error: Expected 1 JSON task(s), found 2", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) @@ -118,7 +114,6 @@ class TestHooksOnModify(TestCase): self.assertIn("Hook Error: JSON must be for the same task:", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) @@ -135,7 +130,6 @@ class TestHooksOnModify(TestCase): self.assertIn("Hook Error: JSON syntax error in: {\"}", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0) @@ -152,7 +146,6 @@ class TestHooksOnModify(TestCase): self.assertIn("Hook Error: JSON Object missing 'uuid' attribute.", err) hook = self.t.hooks[hookname] - hook.assertTriggered() hook.assertTriggeredCount(1) hook.assertExitcode(0)