From 8ad0c1172e25bc380bd94f9051afac9fcbde889b Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 14 Feb 2015 16:46:52 -0500 Subject: [PATCH] Unit Tests - on-add now detects JSON emitted by hooks for different tasks. --- test/hooks.on-add.t | 8 ++++---- test/test_hooks/on-add-misbehave4 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/hooks.on-add.t b/test/hooks.on-add.t index f4d7498a6..8760eec8d 100755 --- a/test/hooks.on-add.t +++ b/test/hooks.on-add.t @@ -95,7 +95,7 @@ class TestHooksOnAdd(TestCase): hookname = 'on-add-misbehave3' self.t.hooks.add_default(hookname, log=True) - code, out, err = self.t(("add", "foo")) + code, out, err = self.t.runError(("add", "foo")) self.assertIn("Hook Error: Expected 1 JSON task(s), found 2", err) self.t.hooks[hookname].assertTriggered() self.t.hooks[hookname].assertTriggeredCount(1) @@ -107,8 +107,8 @@ class TestHooksOnAdd(TestCase): hookname = 'on-add-misbehave4' self.t.hooks.add_default(hookname, log=True) - code, out, err = self.t(("add", "foo")) - self.assertIn("ERROR DIFFERENT JSON", err) + code, out, err = self.t.runError(("add", "foo")) + self.assertIn("Hook Error: JSON must be for the same task:", err) self.t.hooks[hookname].assertTriggered() self.t.hooks[hookname].assertTriggeredCount(1) self.t.hooks[hookname].assertExitcode(0) @@ -120,7 +120,7 @@ class TestHooksOnAdd(TestCase): hookname = 'on-add-misbehave5' self.t.hooks.add_default(hookname, log=True) - code, out, err = self.t(("add", "foo")) + code, out, err = self.t.runError(("add", "foo")) self.assertIn("ERROR SYNTACTICALLY WRONG JSON", err) self.t.hooks[hookname].assertTriggered() self.t.hooks[hookname].assertTriggeredCount(1) diff --git a/test/test_hooks/on-add-misbehave4 b/test/test_hooks/on-add-misbehave4 index c268ae76d..9a6358240 100644 --- a/test/test_hooks/on-add-misbehave4 +++ b/test/test_hooks/on-add-misbehave4 @@ -10,7 +10,7 @@ read new_task # Output: # - JSON, modified or unmodified. # - Optional feedback/error. -echo '{"description":"different","status":"pending"}' +echo '{"description":"different","status":"pending","uuid":"bad"}' echo 'FEEDBACK' # Status: