Attachment 196439 Details for Bug 230711 – py-supervisor-3.3.4.patch

[patch] py-supervisor-3.3.4.patch

py-supervisor-3.3.4.patch (text/plain), 10.31 KB, created by Sergey Akhmatov on 2018-08-22 09:25:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Akhmatov

Created: 2018-08-22 09:25:43 UTC

Size: 10.31 KB

patch

obsolete

>Index: sysutils/py-supervisor/Makefile
>===================================================================
>--- sysutils/py-supervisor/Makefile	(revision 477776)
>+++ sysutils/py-supervisor/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	supervisor
>-PORTVERSION=	3.3.3
>+PORTVERSION=	3.3.4
> PORTEPOCH=	1
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
>@@ -14,14 +14,14 @@
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:www/py-meld3@${PY_FLAVOR}
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0.5.0:devel/py-mock@${PY_FLAVOR}
> 
>-PORTDOCS=	*.txt *.rst
>-
>-NO_ARCH=	yes
>-
> USES=		python:2.7 shebangfix
> USE_PYTHON=	distutils autoplist
> PIDDIR?=	/var/run/supervisor
> 
>+NO_ARCH=	yes
>+PLIST_FILES=	'@sample etc/supervisord.conf.sample'
>+PLIST_DIRS=	${PIDDIR}
>+
> SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
> 		PIDDIR=${PIDDIR}
> PLIST_SUB=	PIDDIR=${PIDDIR}
>@@ -28,14 +28,21 @@
> USE_RC_SUBR=	supervisord
> 
> SHEBANG_FILES=	supervisor/scripts/*.py supervisor/tests/fixtures/*.py
>-python_OLD_CMD=	"/usr/bin/env python"
>-python_OLD_CMD+=	"<<PYTHON>>"
>+python_OLD_CMD=	"<<PYTHON>>"
> 
>+PORTDOCS=	*.txt *.rst
>+
>+OPTIONS_DEFINE=	DOCS
>+
> post-patch:
>-	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/supervisor/options.py
>+	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/supervisor/options.py \
>+		${WRKSRC}/supervisor/tests/test_options.py
> 
> post-install:
> 	${INSTALL_DATA} ${FILESDIR}/supervisord.conf.sample ${STAGEDIR}${PREFIX}/etc
>+	${INSTALL} -d ${STAGEDIR}${PIDDIR}
>+
>+post-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for i in ${PORTDOCS}
> 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
>Index: sysutils/py-supervisor/distinfo
>===================================================================
>--- sysutils/py-supervisor/distinfo	(revision 477776)
>+++ sysutils/py-supervisor/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1505483926
>-SHA256 (supervisor-3.3.3.tar.gz) = 96287ebfabf9a6923f74123b056c4da39c617fef367980f007cac02fba6527ad
>-SIZE (supervisor-3.3.3.tar.gz) = 418354
>+TIMESTAMP = 1534438600
>+SHA256 (supervisor-3.3.4.tar.gz) = 212201a3fd1d35c150ef0c35bf0676fd1a6c195fb60bf0f2147fe7dbd317e672
>+SIZE (supervisor-3.3.4.tar.gz) = 419794
>Index: sysutils/py-supervisor/files/patch-supervisor-tests-test_options.py
>===================================================================
>--- sysutils/py-supervisor/files/patch-supervisor-tests-test_options.py	(revision 477776)
>+++ sysutils/py-supervisor/files/patch-supervisor-tests-test_options.py	(nonexistent)
>@@ -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()
>Index: sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py
>===================================================================
>--- sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py	(revision 477776)
>+++ sysutils/py-supervisor/files/patch-supervisor-tests-test_supervisorctl.py	(nonexistent)
>@@ -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()
>Index: sysutils/py-supervisor/files/patch-supervisor_options.py
>===================================================================
>--- sysutils/py-supervisor/files/patch-supervisor_options.py	(revision 477776)
>+++ sysutils/py-supervisor/files/patch-supervisor_options.py	(working copy)
>@@ -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=")
>  
>Index: sysutils/py-supervisor/files/patch-supervisor_tests_test__options.py
>===================================================================
>--- sysutils/py-supervisor/files/patch-supervisor_tests_test__options.py	(nonexistent)
>+++ sysutils/py-supervisor/files/patch-supervisor_tests_test__options.py	(working copy)
>@@ -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):
>Index: sysutils/py-supervisor/pkg-plist
>===================================================================
>--- sysutils/py-supervisor/pkg-plist	(revision 477776)
>+++ sysutils/py-supervisor/pkg-plist	(nonexistent)
>@@ -1,6 +0,0 @@
>-@sample etc/supervisord.conf.sample
>-@exec mkdir -p %%PIDDIR%%
>-@unexec echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
>-@unexec echo "If you are permanently removing py-supervisor, you should also:" | /usr/bin/fmt
>-@unexec echo "'rm -rf %%PIDDIR%%'" | /usr/bin/fmt
>-@unexec echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="

Flags:

sergey: maintainer-approval? (hizel)

Actions: View | Diff

Attachments on bug 230711: 196293 | 196294 | 196295 | 196380 | 196439