Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r69937:6050dbbb47e6
Date: 2014-03-13 12:58 -0700
http://bitbucket.org/pypy/pypy/changeset/6050dbbb47e6/
Log: fix from last merge
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -288,7 +288,6 @@
RegrTest('test_nis.py'),
RegrTest('test_nntplib.py'),
RegrTest('test_normalization.py'),
- RegrTest('test_nntplib.py'),
RegrTest('test_ntpath.py'),
RegrTest('test_numeric_tower.py'),
RegrTest('test_opcodes.py', core=True),
@@ -405,7 +404,7 @@
RegrTest('test_timeout.py'),
RegrTest('test_tk.py'),
RegrTest('test_tokenize.py'),
- RegrTest('test_tools.py'),
+ #RegrTest('test_tools.py'),
RegrTest('test_trace.py'),
RegrTest('test_traceback.py', core=True),
RegrTest('test_ttk_guionly.py'),
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
