Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3.5
Changeset: r91012:08e002eab7ec
Date: 2017-04-06 23:08 +0200
http://bitbucket.org/pypy/pypy/changeset/08e002eab7ec/
Log: hg merge heads
diff --git a/lib-python/3/test/_test_multiprocessing.py
b/lib-python/3/test/_test_multiprocessing.py
--- a/lib-python/3/test/_test_multiprocessing.py
+++ b/lib-python/3/test/_test_multiprocessing.py
@@ -2147,7 +2147,8 @@
# Because we are using xmlrpclib for serialization instead of
# pickle this will cause a serialization error.
- self.assertRaises(Exception, queue.put, time.sleep)
+ # Changed on PyPy: passing functions to xmlrpc is broken
+ #self.assertRaises(Exception, queue.put, time.sleep)
# Make queue finalizer run before the server is stopped
del queue
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -597,7 +597,7 @@
py.test.skip("%s module not included in %s" % (mod,
execpath))
- cmd = "%s %s %s" % (execpath, regrrun, fspath.purebasename)
+ cmd = "%s -m test -v %s" % (execpath, fspath.purebasename)
# add watchdog for timing out
cmd = "%s %s %s %s" % (python, watchdog_script, TIMEOUT, cmd)
else:
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -5,6 +5,10 @@
.. this is the revision after release-pypy3.3-5.7.x was branched
.. startrev: afbf09453369
+.. branch: mtest
+Use "<python> -m test" to run the CPython test suite, as documented by CPython,
+instead of our outdated regrverbose.py script.
+
.. branch: win32-faulthandler
Enable the 'faulthandler' module on Windows;
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
