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

[Naparuba]

The following commit has been merged in the debian/master branch:
commit 9d7ff410fedc651ec2a50bf3ffdc6fc08ff2de3f
Author: Naparuba <naparuba at gmail.com>
Date:   Thu Dec 15 17:04:08 2011 +0100

    Fix : testactions, we init perf_data of checks as void isntead of thinking it was done by scheduler. It's purely related to tests, no change on run.

diff --git a/shinken/action.py b/shinken/action.py
index 90c776d..146905a 100644
--- a/shinken/action.py
+++ b/shinken/action.py
@@ -75,6 +75,8 @@ class __Action(object):
         elts_line1 = elts[0].split('|')
         # First line before | is output, and strip it
         self.output = elts_line1[0].strip()
+        # Init perfdata as void
+        self.perf_data = ''
         # After | is perfdata, and strip it
         if len(elts_line1) > 1:
             self.perf_data = elts_line1[1].strip()
diff --git a/test/quick_tests.sh b/test/quick_tests.sh
index aca1109..5d9cb07 100755
--- a/test/quick_tests.sh
+++ b/test/quick_tests.sh
@@ -31,7 +31,7 @@ rm -f .coverage
 function launch_and_assert {
     SCRIPT=$1
 #    nosetests -v -s --with-xunit --with-coverage ./$SCRIPT
-    ./$SCRIPT
+    python ./$SCRIPT
     if [ $? != 0 ]
 	then
 	echo "Error : the test $SCRIPT failed"

-- 
UNNAMED PROJECT