[Supervisor-checkins] r878 - in superlance/trunk: . superlance

[Mike Naberezny]

Author: Mike Naberezny <mike at maintainable.com>
Date: Thu May 28 11:28:44 2009
New Revision: 878

Log:
- Fixed test_suite to use the correct module name in setup.py.

- Fixed the tests for memmon to import the correct module.



Modified:
   superlance/trunk/CHANGES.txt
   superlance/trunk/setup.py
   superlance/trunk/superlance/tests.py

Modified: superlance/trunk/CHANGES.txt
==============================================================================
--- superlance/trunk/CHANGES.txt	(original)
+++ superlance/trunk/CHANGES.txt	Thu May 28 11:28:44 2009
@@ -1,6 +1,12 @@
 superlance Changelog
 ====================
 
+Next Release
+
+- Fixed test_suite to use the correct module name in setup.py.
+
+- Fixed the tests for memmon to import the correct module.
+
 0.5 (2009-05-24)
 
 - Added ``memmon`` script, originally bundled with supervisor and

Modified: superlance/trunk/setup.py
==============================================================================
--- superlance/trunk/setup.py	(original)
+++ superlance/trunk/setup.py	Thu May 28 11:28:44 2009
@@ -43,7 +43,7 @@
       tests_require=[
             'supervisor',
             ],
-      test_suite="superlance",
+      test_suite='superlance.tests',
       entry_points = """\
       [console_scripts]
       httpok = superlance.httpok:main

Modified: superlance/trunk/superlance/tests.py
==============================================================================
--- superlance/trunk/superlance/tests.py	(original)
+++ superlance/trunk/superlance/tests.py	Thu May 28 11:28:44 2009
@@ -304,14 +304,13 @@
 
 class MemmonTests(unittest.TestCase):
     def _getTargetClass(self):
-        from supervisor.memmon import Memmon
+        from superlance.memmon import Memmon
         return Memmon
     
     def _makeOne(self, *opts):
         return self._getTargetClass()(*opts)
 
     def _makeOnePopulated(self, programs, groups, any):
-        from supervisor.tests.base import DummyRPCServer
         rpc = DummyRPCServer()
         sendmail = 'cat - > /dev/null'
         email = 'chrism at plope.com'
@@ -613,6 +612,8 @@
     def stopProcess(self, name):
         from supervisor import xmlrpc
         from xmlrpclib import Fault
+        if name == 'BAD_NAME:BAD_NAME':
+            raise Fault(xmlrpc.Faults.BAD_NAME, 'BAD_NAME:BAD_NAME') 
         if name.endswith('FAILED'):
             raise Fault(xmlrpc.Faults.FAILED, 'FAILED')
         return True