[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 d65bdb1545a074d4882fb0028107f314e8b17804
Author: Gerhard Lausser <gerhard.lausser at consol.de>
Date:   Thu Dec 15 15:32:47 2011 +0100

    Fix : test_module_service_perfdata needs an update because output and perfdata are stripped

diff --git a/test/test_module_service_perfdata.py b/test/test_module_service_perfdata.py
index 26dffd0..1a1ca1a 100755
--- a/test/test_module_service_perfdata.py
+++ b/test/test_module_service_perfdata.py
@@ -76,7 +76,7 @@ class TestConfig(ShinkenTest):
         fd = open(mod.path)
         buf = fd.readline()
         #print "BUF:", buf
-        comparison = '%d\t%s\t%s\t%s\t%s\t%s\n' % (t, "test_host_0", "test_ok_0", 'BAD ', 'CRITICAL', ' value1=0 value2=0')
+        comparison = '%d\t%s\t%s\t%s\t%s\t%s\n' % (t, "test_host_0", "test_ok_0", 'BAD', 'CRITICAL', 'value1=0 value2=0')
         #print "Comparison:", comparison
         self.assert_(buf == comparison)
         fd.close()
@@ -104,7 +104,7 @@ class TestConfig(ShinkenTest):
         print fd.read()
 
         
-        comparison = u'%d\t%s\t%s\t%s\t%s\t%s\n' % (t, "test_host_0", "test_ok_0", 'BAD ', ' value1=0 value2=0'+u'\xf6', 'CRITICAL')
+        comparison = u'%d\t%s\t%s\t%s\t%s\t%s\n' % (t, "test_host_0", "test_ok_0", 'BAD', 'value1=0 value2=0'+u'\xf6', 'CRITICAL')
 
         self.assert_(buf == comparison)
         fd.close()

-- 
UNNAMED PROJECT