Author: Brian Kearns <[email protected]>
Branch:
Changeset: r60653:b50f2e3d6c2e
Date: 2013-01-29 01:49 -0500
http://bitbucket.org/pypy/pypy/changeset/b50f2e3d6c2e/
Log: fix lib-python/conftest.py for running tests untranslated
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -61,7 +61,7 @@
usemodules = '',
skip=None):
self.basename = basename
- self._usemodules = usemodules.split() + ['signal']
+ self._usemodules = usemodules.split() + ['signal', 'rctime',
'itertools', '_socket']
self._compiler = compiler
self.core = core
self.skip = skip
@@ -103,29 +103,29 @@
testmap = [
RegrTest('test___all__.py', core=True),
RegrTest('test___future__.py', core=True),
- RegrTest('test__locale.py', skip=skip_win32),
+ RegrTest('test__locale.py', usemodules='_locale', skip=skip_win32),
RegrTest('test_abc.py'),
RegrTest('test_abstract_numbers.py'),
RegrTest('test_aepack.py', skip=True),
RegrTest('test_aifc.py'),
- RegrTest('test_argparse.py'),
RegrTest('test_al.py', skip=True),
- RegrTest('test_ast.py', core=True),
- RegrTest('test_anydbm.py'),
+ RegrTest('test_anydbm.py', usemodules='struct'),
RegrTest('test_applesingle.py', skip=True),
- RegrTest('test_array.py', core=True, usemodules='struct array'),
+ RegrTest('test_argparse.py', usemodules='binascii'),
+ RegrTest('test_array.py', core=True, usemodules='struct array binascii'),
RegrTest('test_ascii_formatd.py'),
- RegrTest('test_asynchat.py', usemodules='thread'),
- RegrTest('test_asyncore.py'),
+ RegrTest('test_ast.py', core=True, usemodules='struct'),
+ RegrTest('test_asynchat.py', usemodules='select fcntl'),
+ RegrTest('test_asyncore.py', usemodules='select fcntl'),
RegrTest('test_atexit.py', core=True),
RegrTest('test_audioop.py', skip=True),
RegrTest('test_augassign.py', core=True),
- RegrTest('test_base64.py'),
+ RegrTest('test_base64.py', usemodules='struct'),
RegrTest('test_bastion.py'),
+ RegrTest('test_bigaddrspace.py'),
+ RegrTest('test_bigmem.py'),
RegrTest('test_binascii.py', usemodules='binascii'),
-
RegrTest('test_binhex.py'),
-
RegrTest('test_binop.py', core=True),
RegrTest('test_bisect.py', core=True, usemodules='_bisect'),
RegrTest('test_bool.py', core=True),
@@ -134,22 +134,23 @@
RegrTest('test_bsddb3.py', skip="unsupported extension module"),
RegrTest('test_buffer.py'),
RegrTest('test_bufio.py', core=True),
- RegrTest('test_builtin.py', core=True),
- RegrTest('test_bytes.py'),
+ RegrTest('test_builtin.py', core=True, usemodules='binascii'),
+ RegrTest('test_bytes.py', usemodules='struct binascii'),
RegrTest('test_bz2.py', usemodules='bz2'),
RegrTest('test_calendar.py'),
RegrTest('test_call.py', core=True),
RegrTest('test_capi.py', skip="not applicable"),
RegrTest('test_cd.py', skip=True),
RegrTest('test_cfgparser.py'),
-
RegrTest('test_cgi.py'),
RegrTest('test_charmapcodec.py', core=True),
RegrTest('test_cl.py', skip=True),
RegrTest('test_class.py', core=True),
RegrTest('test_cmath.py', core=True),
RegrTest('test_cmd.py'),
+ RegrTest('test_cmd_line.py'),
RegrTest('test_cmd_line_script.py'),
+ RegrTest('test_code.py', core=True),
RegrTest('test_codeccallbacks.py', core=True),
RegrTest('test_codecencodings_cn.py', usemodules='_multibytecodec'),
RegrTest('test_codecencodings_hk.py', usemodules='_multibytecodec'),
@@ -157,7 +158,6 @@
RegrTest('test_codecencodings_jp.py', usemodules='_multibytecodec'),
RegrTest('test_codecencodings_kr.py', usemodules='_multibytecodec'),
RegrTest('test_codecencodings_tw.py', usemodules='_multibytecodec'),
-
RegrTest('test_codecmaps_cn.py', usemodules='_multibytecodec'),
RegrTest('test_codecmaps_hk.py', usemodules='_multibytecodec'),
RegrTest('test_codecmaps_jp.py', usemodules='_multibytecodec'),
@@ -165,6 +165,7 @@
RegrTest('test_codecmaps_tw.py', usemodules='_multibytecodec'),
RegrTest('test_codecs.py', core=True, usemodules='_multibytecodec'),
RegrTest('test_codeop.py', core=True),
+ RegrTest('test_coding.py', core=True),
RegrTest('test_coercion.py', core=True),
RegrTest('test_collections.py'),
RegrTest('test_colorsys.py'),
@@ -174,22 +175,24 @@
RegrTest('test_compileall.py'),
RegrTest('test_compiler.py', core=False, skip="slowly deprecating
compiler"),
RegrTest('test_complex.py', core=True),
-
+ RegrTest('test_complex_args.py'),
RegrTest('test_contains.py', core=True),
+ RegrTest('test_contextlib.py', usemodules="thread"),
RegrTest('test_cookie.py'),
RegrTest('test_cookielib.py'),
RegrTest('test_copy.py', core=True),
RegrTest('test_copy_reg.py', core=True),
RegrTest('test_cpickle.py', core=True),
- RegrTest('test_cprofile.py'),
+ RegrTest('test_cprofile.py'),
RegrTest('test_crypt.py', usemodules='crypt', skip=skip_win32),
RegrTest('test_csv.py', usemodules='_csv'),
-
+ RegrTest('test_ctypes.py', usemodules="_rawffi thread"),
RegrTest('test_curses.py', skip="unsupported extension module"),
RegrTest('test_datetime.py'),
RegrTest('test_dbm.py'),
RegrTest('test_decimal.py'),
RegrTest('test_decorators.py', core=True),
+ RegrTest('test_defaultdict.py', usemodules='_collections'),
RegrTest('test_deque.py', core=True, usemodules='_collections'),
RegrTest('test_descr.py', core=True, usemodules='_weakref'),
RegrTest('test_descrtut.py', core=True),
@@ -208,12 +211,13 @@
RegrTest('test_dummy_thread.py', core=True),
RegrTest('test_dummy_threading.py', core=True),
RegrTest('test_email.py'),
-
RegrTest('test_email_codecs.py'),
+ RegrTest('test_email_renamed.py'),
RegrTest('test_enumerate.py', core=True),
RegrTest('test_eof.py', core=True),
RegrTest('test_epoll.py'),
RegrTest('test_errno.py', usemodules="errno"),
+ RegrTest('test_exception_variations.py'),
RegrTest('test_exceptions.py', core=True),
RegrTest('test_extcall.py', core=True),
RegrTest('test_fcntl.py', usemodules='fcntl', skip=skip_win32),
@@ -222,6 +226,7 @@
RegrTest('test_filecmp.py', core=True),
RegrTest('test_fileinput.py', core=True),
RegrTest('test_fileio.py'),
+ RegrTest('test_float.py', core=True),
RegrTest('test_fnmatch.py', core=True),
RegrTest('test_fork1.py', usemodules="thread"),
RegrTest('test_format.py', core=True),
@@ -230,6 +235,7 @@
RegrTest('test_frozen.py', skip="unsupported extension module"),
RegrTest('test_ftplib.py'),
RegrTest('test_funcattrs.py', core=True),
+ RegrTest('test_functools.py'),
RegrTest('test_future.py', core=True),
RegrTest('test_future1.py', core=True),
RegrTest('test_future2.py', core=True),
@@ -245,24 +251,19 @@
RegrTest('test_genexps.py', core=True, usemodules='_weakref'),
RegrTest('test_getargs.py', skip="unsupported extension module"),
RegrTest('test_getargs2.py', skip="unsupported extension module"),
-
RegrTest('test_getopt.py', core=True),
RegrTest('test_gettext.py'),
-
RegrTest('test_gl.py', skip=True),
RegrTest('test_glob.py', core=True),
RegrTest('test_global.py', core=True),
RegrTest('test_grammar.py', core=True),
RegrTest('test_grp.py', skip=skip_win32),
-
- RegrTest('test_gzip.py'),
+ RegrTest('test_gzip.py', usemodules='zlib'),
RegrTest('test_hash.py', core=True),
RegrTest('test_hashlib.py', core=True),
-
RegrTest('test_heapq.py', core=True),
RegrTest('test_hmac.py'),
RegrTest('test_hotshot.py', skip="unsupported extension module"),
-
RegrTest('test_htmllib.py'),
RegrTest('test_htmlparser.py'),
RegrTest('test_httplib.py'),
@@ -274,6 +275,7 @@
RegrTest('test_import.py', core=True),
RegrTest('test_importhooks.py', core=True),
RegrTest('test_importlib.py'),
+ RegrTest('test_index.py'),
RegrTest('test_inspect.py'),
RegrTest('test_int.py', core=True),
RegrTest('test_int_literal.py', core=True),
@@ -307,7 +309,7 @@
RegrTest('test_mhlib.py'),
RegrTest('test_mimetools.py'),
RegrTest('test_mimetypes.py'),
- RegrTest('test_MimeWriter.py', core=False),
+ RegrTest('test_MimeWriter.py', core=False, usemodules='binascii'),
RegrTest('test_minidom.py'),
RegrTest('test_mmap.py', usemodules="mmap"),
RegrTest('test_module.py', core=True),
@@ -324,11 +326,11 @@
RegrTest('test_nis.py', skip="unsupported extension module"),
RegrTest('test_normalization.py'),
RegrTest('test_ntpath.py'),
+ RegrTest('test_old_mailbox.py'),
RegrTest('test_opcodes.py', core=True),
RegrTest('test_openpty.py'),
RegrTest('test_operator.py', core=True),
RegrTest('test_optparse.py'),
-
RegrTest('test_os.py', core=True),
RegrTest('test_ossaudiodev.py', skip="unsupported extension module"),
RegrTest('test_parser.py', skip="slowly deprecating compiler"),
@@ -338,12 +340,14 @@
RegrTest('test_pep263.py'),
RegrTest('test_pep277.py'),
RegrTest('test_pep292.py'),
+ RegrTest('test_pep352.py'),
RegrTest('test_pickle.py', core=True),
RegrTest('test_pickletools.py', core=False),
RegrTest('test_pipes.py'),
RegrTest('test_pkg.py', core=True),
RegrTest('test_pkgimport.py', core=True),
RegrTest('test_pkgutil.py'),
+ RegrTest('test_platform.py'),
RegrTest('test_plistlib.py', skip="unsupported module"),
RegrTest('test_poll.py', skip=skip_win32),
RegrTest('test_popen.py'),
@@ -374,8 +378,8 @@
RegrTest('test_rfc822.py'),
RegrTest('test_richcmp.py', core=True),
RegrTest('test_rlcompleter.py'),
-
RegrTest('test_robotparser.py'),
+ RegrTest('test_runpy.py'),
RegrTest('test_sax.py'),
RegrTest('test_scope.py', core=True),
RegrTest('test_scriptpackages.py', skip="unsupported extension module"),
@@ -389,26 +393,24 @@
RegrTest('test_shlex.py'),
RegrTest('test_shutil.py'),
RegrTest('test_signal.py'),
- RegrTest('test_SimpleHTTPServer.py'),
+ RegrTest('test_SimpleHTTPServer.py', usemodules='binascii'),
RegrTest('test_site.py', core=False),
RegrTest('test_slice.py', core=True),
RegrTest('test_smtplib.py'),
RegrTest('test_smtpnet.py'),
RegrTest('test_socket.py', usemodules='thread _weakref'),
-
RegrTest('test_socketserver.py', usemodules='thread'),
-
RegrTest('test_softspace.py', core=True),
RegrTest('test_sort.py', core=True),
+ RegrTest('test_sqlite.py', usemodules="thread _rawffi zlib"),
RegrTest('test_ssl.py', usemodules='_ssl _socket select'),
+ RegrTest('test_startfile.py'),
RegrTest('test_str.py', core=True),
-
RegrTest('test_strftime.py'),
RegrTest('test_string.py', core=True),
- RegrTest('test_StringIO.py', core=True, usemodules='cStringIO'),
+ RegrTest('test_StringIO.py', core=True, usemodules='cStringIO array'),
RegrTest('test_stringprep.py'),
RegrTest('test_strop.py', skip="deprecated"),
-
RegrTest('test_strptime.py'),
RegrTest('test_strtod.py'),
RegrTest('test_struct.py', usemodules='struct'),
@@ -420,33 +422,30 @@
RegrTest('test_symtable.py', skip="implementation detail"),
RegrTest('test_syntax.py', core=True),
RegrTest('test_sys.py', core=True, usemodules='struct'),
+ RegrTest('test_sys_setprofile.py', core=True),
RegrTest('test_sys_settrace.py', core=True),
- RegrTest('test_sys_setprofile.py', core=True),
RegrTest('test_sysconfig.py'),
+ RegrTest('test_tarfile.py'),
RegrTest('test_tcl.py', skip="unsupported extension module"),
- RegrTest('test_tarfile.py'),
RegrTest('test_telnetlib.py'),
RegrTest('test_tempfile.py'),
-
RegrTest('test_textwrap.py'),
RegrTest('test_thread.py', usemodules="thread", core=True),
RegrTest('test_threaded_import.py', usemodules="thread", core=True),
RegrTest('test_threadedtempfile.py',
usemodules="thread", core=False),
-
RegrTest('test_threading.py', usemodules="thread", core=True),
RegrTest('test_threading_local.py', usemodules="thread", core=True),
RegrTest('test_threadsignals.py', usemodules="thread"),
-
RegrTest('test_time.py', core=True),
RegrTest('test_timeout.py'),
RegrTest('test_tk.py'),
- RegrTest('test_ttk_guionly.py'),
- RegrTest('test_ttk_textonly.py'),
RegrTest('test_tokenize.py'),
RegrTest('test_trace.py'),
RegrTest('test_traceback.py', core=True),
RegrTest('test_transformer.py', core=True),
+ RegrTest('test_ttk_guionly.py'),
+ RegrTest('test_ttk_textonly.py'),
RegrTest('test_tuple.py', core=True),
RegrTest('test_typechecks.py'),
RegrTest('test_types.py', core=True),
@@ -462,6 +461,7 @@
RegrTest('test_unpack.py', core=True),
RegrTest('test_urllib.py'),
RegrTest('test_urllib2.py'),
+ RegrTest('test_urllib2_localnet.py', usemodules="thread"),
RegrTest('test_urllib2net.py'),
RegrTest('test_urllibnet.py'),
RegrTest('test_urlparse.py'),
@@ -469,60 +469,35 @@
RegrTest('test_userlist.py', core=True),
RegrTest('test_userstring.py', core=True),
RegrTest('test_uu.py'),
-
+ RegrTest('test_uuid.py'),
+ RegrTest('test_wait3.py', usemodules="thread"),
+ RegrTest('test_wait4.py', usemodules="thread"),
RegrTest('test_warnings.py', core=True),
RegrTest('test_wave.py', skip="unsupported extension module"),
RegrTest('test_weakref.py', core=True, usemodules='_weakref'),
RegrTest('test_weakset.py'),
-
RegrTest('test_whichdb.py'),
RegrTest('test_winreg.py', skip=only_win32),
RegrTest('test_winsound.py', skip="unsupported extension module"),
- RegrTest('test_xmllib.py'),
- RegrTest('test_xmlrpc.py'),
-
- RegrTest('test_xpickle.py'),
- RegrTest('test_xrange.py', core=True),
- RegrTest('test_zipfile.py'),
- RegrTest('test_zipimport.py', usemodules='zlib zipimport'),
- RegrTest('test_zipimport_support.py', usemodules='zlib zipimport'),
- RegrTest('test_zlib.py', usemodules='zlib'),
-
- RegrTest('test_bigaddrspace.py'),
- RegrTest('test_bigmem.py'),
- RegrTest('test_cmd_line.py'),
- RegrTest('test_code.py'),
- RegrTest('test_coding.py'),
- RegrTest('test_complex_args.py'),
- RegrTest('test_contextlib.py', usemodules="thread"),
- RegrTest('test_ctypes.py', usemodules="_rawffi thread"),
- RegrTest('test_defaultdict.py', usemodules='_collections'),
- RegrTest('test_email_renamed.py'),
- RegrTest('test_exception_variations.py'),
- RegrTest('test_float.py'),
- RegrTest('test_functools.py'),
- RegrTest('test_index.py'),
- RegrTest('test_old_mailbox.py'),
- RegrTest('test_pep352.py'),
- RegrTest('test_platform.py'),
- RegrTest('test_runpy.py'),
- RegrTest('test_sqlite.py', usemodules="thread _rawffi zlib"),
- RegrTest('test_startfile.py', skip="bogus test"),
- RegrTest('test_structmembers.py', skip="depends on _testcapi"),
- RegrTest('test_urllib2_localnet.py', usemodules="thread"),
- RegrTest('test_uuid.py'),
- RegrTest('test_wait3.py', usemodules="thread"),
- RegrTest('test_wait4.py', usemodules="thread"),
RegrTest('test_with.py'),
RegrTest('test_wsgiref.py'),
RegrTest('test_xdrlib.py'),
RegrTest('test_xml_etree.py'),
RegrTest('test_xml_etree_c.py'),
+ RegrTest('test_xmllib.py'),
+ RegrTest('test_xmlrpc.py'),
+ RegrTest('test_xpickle.py'),
+ RegrTest('test_xrange.py', core=True),
+ RegrTest('test_zipfile.py'),
RegrTest('test_zipfile64.py'),
+ RegrTest('test_zipimport.py', usemodules='zlib zipimport'),
+ RegrTest('test_zipimport_support.py', usemodules='zlib zipimport'),
+ RegrTest('test_zlib.py', usemodules='zlib'),
]
def check_testmap_complete():
listed_names = dict.fromkeys([regrtest.basename for regrtest in testmap])
+ assert len(listed_names) == len(testmap)
listed_names['test_support.py'] = True # ignore this
missing = []
for path in testdir.listdir(fil='test_*.py'):
@@ -578,7 +553,7 @@
def getinvocation(self, regrtest):
fspath = regrtest.getfspath()
python = sys.executable
- pypy_script = pypydir.join('bin', 'py.py')
+ pypy_script = pypydir.join('bin', 'pyinteractive.py')
alarm_script = pypydir.join('tool', 'alarm.py')
if sys.platform == 'win32':
watchdog_name = 'watchdog_nt.py'
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
