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

[Naparuba]

The following commit has been merged in the debian/master branch:
commit d2e6a24e5b44946e3419b695710bfa109e22f21c
Author: Naparuba <naparuba at gmail.com>
Date:   Tue Dec 20 10:39:18 2011 +0100

    *Fix : fix test_modules_nrpe_poller.py

diff --git a/shinken/objects/host.py b/shinken/objects/host.py
index bd0b018..ca5edcf 100644
--- a/shinken/objects/host.py
+++ b/shinken/objects/host.py
@@ -333,6 +333,7 @@ class Host(SchedulingItem):
         'normal_check_interval' : 'check_interval',
         'retry_check_interval'  : 'retry_interval',
         'criticity'             : 'business_impact',
+        'hostgroup'             : 'hostgroups',
 #        'criticitymodulations'  : 'business_impact_modulations',
         
     }
diff --git a/shinken/objects/service.py b/shinken/objects/service.py
index 6b71795..27d65be 100644
--- a/shinken/objects/service.py
+++ b/shinken/objects/service.py
@@ -299,6 +299,8 @@ class Service(SchedulingItem):
         'normal_check_interval':    'check_interval',
         'retry_check_interval' :    'retry_interval',
         'criticity'            :    'business_impact',
+        'hostgroup'            :    'hostgroup_name',
+        'hostgroups'            :    'hostgroup_name',
 #        'criticitymodulations' :    'business_impact_modulations',
     }
 
diff --git a/test/test_modules_nrpe_poller.py b/test/test_modules_nrpe_poller.py
index 6de4c47..2303261 100755
--- a/test/test_modules_nrpe_poller.py
+++ b/test/test_modules_nrpe_poller.py
@@ -58,9 +58,10 @@ class TestNrpePoller(ShinkenTest):
         sl.id = 1
         sl.i_am_dying = False
 
-        to_queue = Queue()
+
         manager = Manager()
-        from_queue = manager.list()
+        to_queue = manager.Queue()
+        from_queue = manager.Queue()#list()
         control_queue = Queue()
 
         # We prepare a check in the to_queue
@@ -89,15 +90,15 @@ class TestNrpePoller(ShinkenTest):
         control_queue.put(msg2)
         sl.work(to_queue, from_queue, control_queue)
 
-        o = from_queue.pop()
+        o = from_queue.get()#pop()
         print "O", o
         
         print o.__dict__
         self.assert_(o.status == 'done')
         self.assert_(o.exit_status == 2)
 
-        to_queue.close()
-        control_queue.close()
+        #to_queue.close()
+        #control_queue.close()
         
 
 

-- 
UNNAMED PROJECT