From owner-svn-ports-all@FreeBSD.ORG  Mon Oct 29 21:20:54 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9E0306F8;
 Mon, 29 Oct 2012 21:20:54 +0000 (UTC) (envelope-from rm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 6C4638FC08;
 Mon, 29 Oct 2012 21:20:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9TLKsAd046585;
 Mon, 29 Oct 2012 21:20:54 GMT (envelope-from rm@svn.freebsd.org)
Received: (from rm@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9TLKs7U046581;
 Mon, 29 Oct 2012 21:20:54 GMT (envelope-from rm@svn.freebsd.org)
Message-Id: <201210292120.q9TLKs7U046581@svn.freebsd.org>
From: Ruslan Mahmatkhanov <rm@FreeBSD.org>
Date: Mon, 29 Oct 2012 21:20:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306640 - in head/sysutils/py-supervisor: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Oct 2012 21:20:54 -0000

Author: rm
Date: Mon Oct 29 21:20:53 2012
New Revision: 306640
URL: http://svn.freebsd.org/changeset/ports/306640

Log:
  - update minimum required py-meld3 version
  - use TEST_DEPENDS for tinderbox builds
  - add OPTIONS for unit tests
  - add regression-test target
  - add the upstream patch to fix tests [1]
  
  PR:		172851
  Submitted by:	Kubilay Kocak <koobs.freebsd at gmail dot com>
  Approved by:	Ildar Hizbulin <hizel at vyborg dot ru> (maintainer) [1]
  Feature safe:	yes

Added:
  head/sysutils/py-supervisor/files/patch-supervisor-tests-test_childutils.py   (contents, props changed)
Modified:
  head/sysutils/py-supervisor/Makefile

Modified: head/sysutils/py-supervisor/Makefile
==============================================================================
--- head/sysutils/py-supervisor/Makefile	Mon Oct 29 21:12:52 2012	(r306639)
+++ head/sysutils/py-supervisor/Makefile	Mon Oct 29 21:20:53 2012	(r306640)
@@ -10,7 +10,19 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 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 @@ post-install:
 .endfor
 .endif
 
+regression-test: build
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+
 .include <bsd.port.mk>

Added: head/sysutils/py-supervisor/files/patch-supervisor-tests-test_childutils.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/py-supervisor/files/patch-supervisor-tests-test_childutils.py	Mon Oct 29 21:20:53 2012	(r306640)
@@ -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')
+