Minor test extension.

src/supervisor/supervisord.py

@@ -65,7 +65,7 @@ def getSupervisorStateDescription(code):
 class Supervisor:
     mood = 1 # 1: up, 0: restarting, -1: suicidal
     stopping = False # set after we detect that we are handling a stop request
-    lastdelayreport = 0
+    lastdelayreport = 0 # while we're stopping, if delayed, last time we tried
 
     def __init__(self, options):
         self.options = options

src/supervisor/tests/test_supervisord.py

@@ -31,10 +31,11 @@ class SupervisordTests(unittest.TestCase):
         self.assertEqual(options.autochildlogs_created, True)
         self.assertEqual(len(supervisord.processes), 1)
         self.assertEqual(supervisord.processes['foo'].options, options)
-        self.assertEqual(options.pidfile_written, True)
+        self.assertEqual(options.environment_processed, True)
         self.assertEqual(options.httpserver_opened, True)
         self.assertEqual(options.signals_set, True)
         self.assertEqual(options.daemonized, True)
+        self.assertEqual(options.pidfile_written, True)
         self.assertEqual(options.cleaned_up, True)
 
     def test_get_state(self):
@@ -253,7 +254,6 @@ class SupervisordTests(unittest.TestCase):
         self.assertEqual(supervisord.mood, 1)
         self.assertEqual(options.logger.data[0],
                          'received SIGUSR1 indicating nothing')
-        
 
 def test_suite():
     return unittest.findTestCases(sys.modules[__name__])