diff options
Diffstat (limited to 'sysutils/py-supervisor/files')
4 files changed, 20 insertions, 127 deletions
diff --git a/sysutils/py-supervisor/files/patch-supervisor-tests-test_options.py b/sysutils/py-supervisor/files/patch-supervisor-tests-test_options.py deleted file mode 100644 index 884acec794a0..000000000000 --- a/sysutils/py-supervisor/files/patch-supervisor-tests-test_options.py +++ /dev/null @@ -1,85 +0,0 @@ ---- supervisor/tests/test_options.py.orig 2016-05-14 21:19:49.000000000 +0300 -+++ supervisor/tests/test_options.py 2016-06-08 17:05:08.114929000 +0300 -@@ -157,15 +157,15 @@ class OptionTests(unittest.TestCase): - short=False, - ) - -- def test_searchpaths(self): -- options = self._makeOptions() -- self.assertEqual(len(options.searchpaths), 6) -- self.assertEqual(options.searchpaths[-4:], [ -- 'supervisord.conf', -- 'etc/supervisord.conf', -- '/etc/supervisord.conf', -- '/etc/supervisor/supervisord.conf', -- ]) -+# def test_searchpaths(self): -+# options = self._makeOptions() -+# self.assertEqual(len(options.searchpaths), 6) -+# self.assertEqual(options.searchpaths[-4:], [ -+# 'supervisord.conf', -+# 'etc/supervisord.conf', -+# '/etc/supervisord.conf', -+# '/etc/supervisor/supervisord.conf', -+# ]) - - def test_options_and_args_order(self): - # Only config file exists -@@ -352,17 +352,17 @@ class ClientOptionsTests(unittest.TestCa - except ValueError, exc: - self.assertTrue("could not find config file" in exc.args[0]) - -- def test_read_config_unreadable(self): -- instance = self._makeOne() -- def dummy_open(fn, mode): -- raise IOError(errno.EACCES, 'Permission denied: %s' % fn) -- instance.open = dummy_open -- -- try: -- instance.read_config(__file__) -- self.fail("expected exception") -- except ValueError, exc: -- self.assertTrue("could not read config file" in exc.args[0]) -+# def test_read_config_unreadable(self): -+# instance = self._makeOne() -+# def dummy_open(fn, mode): -+# raise IOError(errno.EACCES, 'Permission denied: %s' % fn) -+# instance.open = dummy_open -+ -+# try: -+# instance.read_config(__file__) -+# self.fail("expected exception") -+# except ValueError, exc: -+# self.assertTrue("could not read config file" in exc.args[0]) - - def test_read_config_no_supervisord_section_raises_valueerror(self): - instance = self._makeOne() -@@ -803,17 +803,17 @@ class ServerOptionsTests(unittest.TestCa - except ValueError, exc: - self.assertTrue("could not find config file" in exc.args[0]) - -- def test_read_config_unreadable(self): -- instance = self._makeOne() -- def dummy_open(fn, mode): -- raise IOError(errno.EACCES, 'Permission denied: %s' % fn) -- instance.open = dummy_open -- -- try: -- instance.read_config(__file__) -- self.fail("nothing raised") -- except ValueError, exc: -- self.assertTrue("could not read config file" in exc.args[0]) -+# def test_read_config_unreadable(self): -+# instance = self._makeOne() -+# def dummy_open(fn, mode): -+# raise IOError(errno.EACCES, 'Permission denied: %s' % fn) -+# instance.open = dummy_open -+ -+# try: -+# instance.read_config(__file__) -+# self.fail("nothing raised") -+# except ValueError, exc: -+# self.assertTrue("could not read config file" in exc.args[0]) - - def test_read_config_malformed_config_file_raises_valueerror(self): - instance = self._makeOne() diff --git a/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py b/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py deleted file mode 100644 index b97b75cd8a7a..000000000000 --- a/sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py +++ /dev/null @@ -1,40 +0,0 @@ ---- 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.assertTrue(val.startswith('Error: bad argument wrong'), val) - -- 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] -- self.assertEqual(plugin.listener.closed, -- 'http://localhost:65532/mainlogtail') -- self.assertEqual(error[0], -- 'http://localhost:65532/mainlogtail') -- for msg in ('Cannot connect', 'socket.error'): -- self.assertTrue(msg in error[1]) -+# 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] -+# self.assertEqual(plugin.listener.closed, -+# 'http://localhost:65532/mainlogtail') -+# self.assertEqual(error[0], -+# 'http://localhost:65532/mainlogtail') -+# for msg in ('Cannot connect', 'socket.error'): -+# self.assertTrue(msg in error[1]) - - def test_maintail_bad_modifier(self): - plugin = self._makeOne() diff --git a/sysutils/py-supervisor/files/patch-supervisor_options.py b/sysutils/py-supervisor/files/patch-supervisor_options.py index 3e20c2d10381..4b4cb859e68b 100644 --- a/sysutils/py-supervisor/files/patch-supervisor_options.py +++ b/sysutils/py-supervisor/files/patch-supervisor_options.py @@ -1,5 +1,5 @@ ---- supervisor/options.py.orig 2016-06-08 17:09:41.213297000 +0300 -+++ supervisor/options.py 2016-06-08 17:10:18.970354000 +0300 +--- supervisor/options.py.orig 2018-02-15 21:18:33 UTC ++++ supervisor/options.py @@ -96,13 +96,7 @@ class Options: self.add("configfile", None, "c:", "configuration=") diff --git a/sysutils/py-supervisor/files/patch-supervisor_tests_test__options.py b/sysutils/py-supervisor/files/patch-supervisor_tests_test__options.py new file mode 100644 index 000000000000..baee4d2e92c4 --- /dev/null +++ b/sysutils/py-supervisor/files/patch-supervisor_tests_test__options.py @@ -0,0 +1,18 @@ +--- supervisor/tests/test_options.py.orig 2018-02-15 21:31:47 UTC ++++ supervisor/tests/test_options.py +@@ -160,12 +160,9 @@ class OptionTests(unittest.TestCase): + + def test_searchpaths(self): + options = self._makeOptions() +- self.assertEqual(len(options.searchpaths), 6) +- self.assertEqual(options.searchpaths[-4:], [ +- 'supervisord.conf', +- 'etc/supervisord.conf', +- '/etc/supervisord.conf', +- '/etc/supervisor/supervisord.conf', ++ self.assertEqual(len(options.searchpaths), 1) ++ self.assertEqual(options.searchpaths[-1:], [ ++ '%%PREFIX%%/etc/supervisord.conf', + ]) + + def test_options_and_args_order(self): |