Changeset b175d61 in nscp

Timestamp:

01/20/12 07:40:51 (16 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

bd1e5e5

Parents:

f19371a

Message:

• Fixed a race condition in the python unit test script

Files:

• changelog (modified) (1 diff)
• scripts/python/test_nsca.py (modified) (5 diffs)

changelog

@@ -5 +5 @@
  * Fixa dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2012-01-20 MickeM
+ * Fixed a race condition in the python unit test script
 
 2012-01-19 MickeM

scripts/python/test_nsca.py

@@ -30 +30 @@
   message = None
   perfdata = None
+  got_response = False
   got_simple_response = False
 
@@ -42 +43 @@
     #self.uuid = unicodedata.normalize('NFKD', command).encode('ascii','ignore')
     self.command = command
+    self.uuid = None
+    self.source = None
+    self.status = None
+    self.message = None
+    self.perfdata = None
+    self.got_response = False
+    self.got_simple_response = False
+    
+    
+  def copy_changed_attributes(self, other):
+    if other.source:
+      self.source = other.source
+    if other.command:
+      self.command = other.command
+    if other.status:
+      self.status = other.status
+    if other.message:
+      self.message = other.message
+    if other.perfdata:
+      self.perfdata = other.perfdata
+    if other.got_simple_response:
+      self.got_simple_response = True
+  
   def __str__(self):
     return 'Message: %s (%s, %s, %s)'%(self.uuid, self.source, self.command, self.status)
@@ -65 +89 @@
   def set_response(self, msg):
     with sync:
-      self._responses[msg.uuid] = msg
+      self._responses[msg.uuid].copy_changed_attributes(msg)
 
   def del_response(self, id):
@@ -95 +119 @@
   
   def simple_inbox_handler_wrapped(self, channel, source, command, status, message, perf):
-    log('Got simple message %s'%command)
+    log('Got simple message %s on %s'%(command, channel))
     msg = self.get_response(command)
     msg.source = source
@@ -106 +130 @@
 
   def inbox_handler_wrapped(self, channel, request):
-    log_error('DISCARDING message on %s'%(channel))
-    
     message = plugin_pb2.SubmitRequestMessage()
     message.ParseFromString(request)