[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[Gerhard Lausser]

The following commit has been merged in the debian/master branch:
commit 908b1707d11a1243b4fe6e96f791a7b8db15fa2b
Author: Gerhard Lausser <gerhard.lausser at consol.de>
Date:   Sun Feb 5 20:27:23 2012 +0100

    Fix the test again for issue #155

diff --git a/test/test_action.py b/test/test_action.py
index ab6d718..8c21341 100755
--- a/test/test_action.py
+++ b/test/test_action.py
@@ -154,7 +154,9 @@ class TestAction(ShinkenTest):
         self.assert_(a.status == 'done')
         print "FUck", a.status, a.output
         if sys.version_info < (2, 7):
-            self.assert_('sh: -c: line 0: unexpected EOF while looking for matching' in a.output)
+            # cygwin: /bin/sh: -c: line 0: unexpected EOF while looking for matching'
+            # ubuntu: /bin/sh: Syntax error: Unterminated quoted string
+            self.assert_(a.output.startswith("/bin/sh"))
             self.assert_(a.exit_status == 3)
         else:
             self.assert_(a.output == 'Not a valid shell command: No closing quotation')

-- 
UNNAMED PROJECT