diff options
Diffstat (limited to 'sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py')
| -rw-r--r-- | sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py b/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py index 9477c8141b4b..b97b75cd8a7a 100644 --- a/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py +++ b/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py @@ -1,13 +1,18 @@ ---- supervisor/tests/test_supervisorctl.py.old 2013-05-27 06:39:09.000000000 +0400 -+++ supervisor/tests/test_supervisorctl.py 2013-08-23 15:06:11.000000000 +0400 -@@ -889,19 +889,19 @@ +--- supervisor/tests/test_supervisorctl.py.orig 2016-06-08 17:08:09.404989000 +0300 ++++ supervisor/tests/test_supervisorctl.py 2016-06-08 17:08:32.361939000 +0300 +@@ -1562,23 +1562,23 @@ class TestDefaultControllerPlugin(unitte val = plugin.ctl.stdout.getvalue() - self.failUnless(val.startswith('Error: bad argument wrong'), val) + self.assertTrue(val.startswith('Error: bad argument wrong'), val) -- def test_maintail_dashf(self): +- def _dont_test_maintail_dashf(self): ++# def _dont_test_maintail_dashf(self): + # https://github.com/Supervisor/supervisor/issues/285 + # TODO: Refactor so we can test more of maintail -f than just a + # connect error, and fix this test so it passes on FreeBSD. - plugin = self._makeOne() - plugin.listener = DummyListener() - result = plugin.do_maintail('-f') +- self.assertEqual(result, None) - errors = plugin.listener.errors - self.assertEqual(len(errors), 1) - error = errors[0] @@ -17,10 +22,10 @@ - 'http://localhost:65532/mainlogtail') - for msg in ('Cannot connect', 'socket.error'): - self.assertTrue(msg in error[1]) -+# def test_maintail_dashf(self): +# plugin = self._makeOne() +# plugin.listener = DummyListener() +# result = plugin.do_maintail('-f') ++# self.assertEqual(result, None) +# errors = plugin.listener.errors +# self.assertEqual(len(errors), 1) +# error = errors[0] @@ -31,5 +36,5 @@ +# for msg in ('Cannot connect', 'socket.error'): +# self.assertTrue(msg in error[1]) - def test_maintail_nobytes(self): + def test_maintail_bad_modifier(self): plugin = self._makeOne() |