Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Oct 2012 12:27:57 +0400
From:      "Ildar Hizbulin" <hizel@vyborg.ru>
To:        bug-followup@freebsd.org, "Kubilay Kocak" <koobs.freebsd@gmail.com>
Cc:        Ruslan Mahmatkhanov <cvs-src@yandex.ru>, freebsd-python@freebsd.org
Subject:   Re: ports/172851: [PATCH] sysutils/py-supervisor: update to 3.0b1 + OPTIONS + more
Message-ID:  <op.wmkm4vxqvet17k@wnight>
In-Reply-To: <50813729.1030306@gmail.com>
References:  <201210181220.q9ICK2nl063740@freefall.freebsd.org> <50813729.1030306@gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
------------e3XHFnrhO3UnSDdMxbcwg4
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes
Content-Transfer-Encoding: 7bit

Final patch with fix test error. To  
https://github.com/Supervisor/supervisor/issues/155 send pull request.

-- 
e-mail: hizel@vyborg.ru
jid: hizel@vyborg.ru
------------e3XHFnrhO3UnSDdMxbcwg4
Content-Disposition: attachment; filename=py-supervisor.txt
Content-Type: text/plain; name=py-supervisor.txt
Content-Transfer-Encoding: 7bit

diff -ruN sysutils/py-supervisor.old/Makefile sysutils/py-supervisor/Makefile
--- sysutils/py-supervisor.old/Makefile	2012-10-22 12:12:59.000000000 +0400
+++ sysutils/py-supervisor/Makefile	2012-10-22 12:19:19.000000000 +0400
@@ -10,7 +10,19 @@
 MAINTAINER=	hizel@vyborg.ru
 COMMENT=	System to monitor and control a number of processes on UNIX-like OS
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}meld3>=0.6.4:${PORTSDIR}/www/py-meld3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:${PORTSDIR}/www/py-meld3
+TEST_DEPENDS:=	${RUN_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+
+OPTIONS_DEFINE=	TESTS
+TESTS_DESC=	Install mock for running unit tests
+OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTESTS}
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+.endif
 
 PORTDOCS=	*.txt *.rst
 
@@ -37,4 +49,7 @@
 .endfor
 .endif
 
+regression-test: build
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+
 .include <bsd.port.mk>
diff -ruN sysutils/py-supervisor.old/files/patch-supervisor-tests-test_childutils.py sysutils/py-supervisor/files/patch-supervisor-tests-test_childutils.py
--- sysutils/py-supervisor.old/files/patch-supervisor-tests-test_childutils.py	1970-01-01 03:00:00.000000000 +0300
+++ sysutils/py-supervisor/files/patch-supervisor-tests-test_childutils.py	2012-10-22 12:23:18.000000000 +0400
@@ -0,0 +1,11 @@
+--- supervisor/tests/test_childutils.py
++++ supervisor/tests/test_childutils.py
+@@ -41,7 +41,7 @@ class ChildUtilsTests(unittest.TestCase):
+ 
+     def test_get_asctime(self):
+         from supervisor.childutils import get_asctime
+-        timestamp = time.mktime((2009, 1, 18, 22, 14, 7, 0, 0, 0))
++        timestamp = time.mktime((2009, 1, 18, 22, 14, 7, 0, 0, -1))
+         result = get_asctime(timestamp)
+         self.assertEqual(result, '2009-01-18 22:14:07,000')
+ 

------------e3XHFnrhO3UnSDdMxbcwg4--




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?op.wmkm4vxqvet17k>