[Supervisor-checkins] r823 - superlance/trunk/superlance

[Chris McDonough]

Author: Chris McDonough <chrism at agendaless.com>
Date: Fri Nov 21 14:29:38 2008
New Revision: 823

Log:
Use imperative testing to fix for prod.


Modified:
   superlance/trunk/superlance/crashmail.py
   superlance/trunk/superlance/tests.py

Modified: superlance/trunk/superlance/crashmail.py
==============================================================================
--- superlance/trunk/superlance/crashmail.py	(original)
+++ superlance/trunk/superlance/crashmail.py	Fri Nov 21 14:29:38 2008
@@ -22,7 +22,7 @@
 #
 # [eventlistener:crashmail]
 # command=python -u /bin/paster serve myserver.ini
-# events=PROCESS_STATE_CHANGE
+# events=PROCESS_STATE
 
 doc = """\
 crashmail.py [-p processname] [-a] [-o string] [-m mail_address]
@@ -97,7 +97,7 @@
                     break
                 continue
 
-            pheaders, pdata = childutils.eventdata(payload)
+            pheaders, pdata = childutils.eventdata(payload+'\n')
 
             if int(pheaders['expected']):
                 childutils.listener.ok(self.stdout)

Modified: superlance/trunk/superlance/tests.py
==============================================================================
--- superlance/trunk/superlance/tests.py	(original)
+++ superlance/trunk/superlance/tests.py	Fri Nov 21 14:29:38 2008
@@ -171,7 +171,7 @@
         any = None
         prog = self._makeOnePopulated(programs, any)
         payload=('expected:1 processname:foo groupname:bar '
-                 'from_state:RUNNING pid:1\n')
+                 'from_state:RUNNING pid:1')
         prog.stdin.write(
             'eventname:PROCESS_STATE_EXITED len:%s\n' % len(payload))
         prog.stdin.write(payload)
@@ -184,7 +184,7 @@
         any = None
         prog = self._makeOnePopulated(programs, any)
         payload=('expected:0 processname:foo groupname:bar '
-                 'from_state:RUNNING pid:1\n')
+                 'from_state:RUNNING pid:1')
         prog.stdin.write(
             'eventname:PROCESS_STATE_EXITED len:%s\n' % len(payload))
         prog.stdin.write(payload)