Merge remote-tracking branch 'msabramo/issue_388_intermittent_test_failures_in_test_rpcinterfaces.py' into merge.py3k

supervisor/tests/test_rpcinterfaces.py

@@ -723,8 +723,8 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
     def test_stopProcessGroup(self):
         options = DummyOptions()
-        pconfig1 = DummyPConfig(options, 'process1', '/bin/foo')
-        pconfig2 = DummyPConfig(options, 'process2', '/bin/foo2')
+        pconfig1 = DummyPConfig(options, 'process1', '/bin/foo', priority=1)
+        pconfig2 = DummyPConfig(options, 'process2', '/bin/foo2', priority=2)
         from supervisor.process import ProcessStates
         supervisord = PopulatedDummySupervisor(options, 'foo', pconfig1,
                                                pconfig2)
@@ -751,8 +751,8 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
     def test_stopProcessGroup_nowait(self):
         options = DummyOptions()
-        pconfig1 = DummyPConfig(options, 'process1', __file__)
-        pconfig2 = DummyPConfig(options, 'process2', __file__)
+        pconfig1 = DummyPConfig(options, 'process1', __file__, priority=1)
+        pconfig2 = DummyPConfig(options, 'process2', __file__, priority=2)
         supervisord = PopulatedDummySupervisor(options, 'foo', pconfig1,
                                                pconfig2)
         from supervisor.process import ProcessStates
@@ -804,8 +804,8 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
     def test_stopAllProcesses(self):
         options = DummyOptions()
-        pconfig1 = DummyPConfig(options, 'process1', '/bin/foo')
-        pconfig2 = DummyPConfig(options, 'process2', '/bin/foo2')
+        pconfig1 = DummyPConfig(options, 'process1', '/bin/foo', priority=1)
+        pconfig2 = DummyPConfig(options, 'process2', '/bin/foo2', priority=2)
         from supervisor.process import ProcessStates
         supervisord = PopulatedDummySupervisor(options, 'foo', pconfig1,
                                                pconfig2)
@@ -832,8 +832,8 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
     def test_stopAllProcesses_nowait(self):
         options = DummyOptions()
-        pconfig1 = DummyPConfig(options, 'process1', __file__)
-        pconfig2 = DummyPConfig(options, 'process2', __file__)
+        pconfig1 = DummyPConfig(options, 'process1', __file__, priority=1)
+        pconfig2 = DummyPConfig(options, 'process2', __file__, priority=2)
         supervisord = PopulatedDummySupervisor(options, 'foo', pconfig1,
                                                pconfig2)
         from supervisor.process import ProcessStates
@@ -1513,8 +1513,8 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
     def test_clearAllProcessLogs(self):
         options = DummyOptions()
-        pconfig1 = DummyPConfig(options, 'process1', 'foo')
-        pconfig2 = DummyPConfig(options, 'process2', 'bar')
+        pconfig1 = DummyPConfig(options, 'process1', 'foo', priority=1)
+        pconfig2 = DummyPConfig(options, 'process2', 'bar', priority=2)
         supervisord = PopulatedDummySupervisor(options, 'foo', pconfig1,
                                                pconfig2)
         interface = self._makeOne(supervisord)
@@ -1539,8 +1539,8 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
     def test_clearAllProcessLogs_onefails(self):
         options = DummyOptions()
-        pconfig1 = DummyPConfig(options, 'process1', 'foo')
-        pconfig2 = DummyPConfig(options, 'process2', 'bar')
+        pconfig1 = DummyPConfig(options, 'process1', 'foo', priority=1)
+        pconfig2 = DummyPConfig(options, 'process2', 'bar', priority=2)
         supervisord = PopulatedDummySupervisor(options, 'foo', pconfig1,
                                                pconfig2)
         supervisord.set_procattr('process1', 'error_at_clear', True)