j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:

> j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
>
>>>> On Mon, Apr 06, 2015 at 11:28:14AM +0100, Jérémie Courrèges-Anglas wrote:
>>>>> "Dmitrij D. Czarkoff" <czark...@gmail.com> writes:
>>>>> 
>>>>> > Hi!
>>>>> >
>>>>> > Below is an update to devel/py-dulwich (0.10.0 -> 0.10.1a).  It is a
>>>>> > bugfix release which deals with delta errors.
>>>>> >
>>>>> > Comments?  OKs?
>>>>> 
>>>>> ok jca@
>>>>> 
>>>>> Does anyone have an idea about the select.poll() errors in the regress
>>>>> output?  If not, I'll take a look at it this afternoon GMT.
>>
>> https://github.com/gevent/gevent/issues/446
>>
>> sigh
>
> So to work around this issue the following patch could be used.
> Additionally we could add py-mock as a test dep on devel/py-mock.  What
> about running nosetests with the -v flag?
>
> $OpenBSD$
> --- dulwich/contrib/test_swift_smoke.py.orig  Sun Mar 22 12:52:07 2015
> +++ dulwich/contrib/test_swift_smoke.py       Tue Apr  7 09:05:28 2015
> @@ -41,6 +41,11 @@ import gevent
>  from gevent import monkey
>  monkey.patch_all()
>  
> +# force the 'subprocess' module to use select() instead of poll();
> +# the latter gets removed from the 'select' module by 
> gevent.monkey.patch_all()
> +import subprocess
> +subprocess._has_poll = False
> +
>  from dulwich import server
>  from dulwich import repo
>  from dulwich import index

I see that the update has been committed.  What about the following
patch?

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-dulwich/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile    7 Apr 2015 05:09:29 -0000       1.17
+++ Makefile    7 Apr 2015 09:29:51 -0000
@@ -30,12 +30,13 @@ RUN_DEPENDS =               devel/py-gevent \
 # The other failed tests are related to this bug:
 # https://github.com/surfly/gevent/issues/446
 TEST_DEPENDS =         ${RUN_DEPENDS} \
+                       devel/py-mock \
                        devel/py-nose \
                        devel/git,-main
 
 
 do-test:
-       cd ${WRKSRC} && nosetests
+       cd ${WRKSRC} && nosetests -v
 
 post-install:
        rm -R ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/docs
Index: patches/patch-dulwich_contrib_test_swift_smoke_py
===================================================================
RCS file: patches/patch-dulwich_contrib_test_swift_smoke_py
diff -N patches/patch-dulwich_contrib_test_swift_smoke_py
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-dulwich_contrib_test_swift_smoke_py   7 Apr 2015 09:29:51 
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- dulwich/contrib/test_swift_smoke.py.orig   Sun Mar 22 12:52:07 2015
++++ dulwich/contrib/test_swift_smoke.py        Tue Apr  7 09:05:28 2015
+@@ -41,6 +41,11 @@ import gevent
+ from gevent import monkey
+ monkey.patch_all()
+ 
++# force the 'subprocess' module to use select() instead of poll();
++# the latter gets removed from the 'select' module by 
gevent.monkey.patch_all()
++import subprocess
++subprocess._has_poll = False
++
+ from dulwich import server
+ from dulwich import repo
+ from dulwich import index


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to