Attachment 145031 Details for Bug 191795 – Updated patch incorporating feedback.

[patch] Updated patch incorporating feedback.

fix-py-nose-tests.patch (text/plain), 2.17 KB, created by Melvyn Sopacua on 2014-07-27 14:22:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Melvyn Sopacua

Created: 2014-07-27 14:22:55 UTC

Size: 2.17 KB

patch

obsolete

>diff -r 55d838c9e68e devel/py-nose/Makefile
>--- a/devel/py-nose/Makefile	Fri Jul 25 15:36:31 2014 +0000
>+++ b/devel/py-nose/Makefile	Sun Jul 27 16:20:55 2014 +0200
>@@ -18,7 +18,13 @@
> USE_PYDISTUTILS=	yes
> PYDISTUTILS_AUTOPLIST=	yes
> 
>+.include <bsd.port.pre.mk>
>+
> regression-test: build
>-	@cd ${WRKSRC} && ${PYTHON_CMD} selftest.py
>+# Extra tests for python 3, added in by setup3lib.py
>+.if ${PYTHON_REL} >= 300
>+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} build_tests
>+.endif
>+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -r 55d838c9e68e devel/py-nose/files/patch-unit_tests__test_config_defaults.rst
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/devel/py-nose/files/patch-unit_tests__test_config_defaults.rst	Sun Jul 27 16:20:55 2014 +0200
>@@ -0,0 +1,38 @@
>+--- unit_tests/test_config_defaults.rst.orig	2011-12-14 15:01:38.000000000 +0100
>++++ unit_tests/test_config_defaults.rst	2014-07-10 06:45:35.000000000 +0200
>+@@ -91,7 +91,7 @@
>+ 
>+     >>> options, args = parse([], StringIO("spam"))
>+     error: Error reading config file '<???>': File contains no section headers.
>+-    file: <???>, line: 1
>++    file: '<???>', line: 1
>+     'spam'
>+ 
>+ (filename)
>+@@ -99,7 +99,7 @@
>+     >>> options, args = parse([], os.path.join(support, "invalid.cfg"))
>+     ... # doctest: +ELLIPSIS
>+     error: Error reading config file '...invalid.cfg': File contains no section headers.
>+-    file: ...invalid.cfg, line: 1
>++    file: ...invalid.cfg', line: 1
>+     'spam\n'
>+ 
>+ (filenames, length == 1)
>+@@ -107,7 +107,7 @@
>+     >>> options, args = parse([], [os.path.join(support, "invalid.cfg")])
>+     ... # doctest: +ELLIPSIS
>+     error: Error reading config file '...invalid.cfg': File contains no section headers.
>+-    file: ...invalid.cfg, line: 1
>++    file: ...invalid.cfg', line: 1
>+     'spam\n'
>+ 
>+ (filenames, length > 1)
>+@@ -120,7 +120,7 @@
>+     ...                            os.path.join(support, "b.cfg")])
>+     ... # doctest: +ELLIPSIS
>+     error: Error reading config file '...invalid.cfg': File contains no section headers.
>+-    file: ...invalid.cfg, line: 1
>++    file: ...invalid.cfg', line: 1
>+     'spam\n'
>+ 
>+

Actions: View | Diff

Attachments on bug 191795: 144564 | 145031 | 145033