[pypy-svn] rev 2689 - in pypy/trunk/src/pypy: annotation/test appspaceappspace/test interpreter interpreter/test module/test objspace/flow/test objspace/std/test objspace/test tool tool/testdata translator translator/test translator/tool
hpk at codespeak.net
hpk at codespeak.net
Wed Dec 24 00:01:56 CET 2003
Author: hpk
Date: Wed Dec 24 00:01:48 2003
New Revision: 2689
Modified:
pypy/trunk/src/pypy/annotation/test/test_annset.py
pypy/trunk/src/pypy/appspace/builtin_functions_test.py
pypy/trunk/src/pypy/appspace/test/test_cmathmodule.py
pypy/trunk/src/pypy/appspace/test/test_complexobject.py
pypy/trunk/src/pypy/appspace/test/test_stringmodule.py
pypy/trunk/src/pypy/interpreter/interactive.py
pypy/trunk/src/pypy/interpreter/test/test_class.py
pypy/trunk/src/pypy/interpreter/test/test_code.py
pypy/trunk/src/pypy/interpreter/test/test_eval.py
pypy/trunk/src/pypy/interpreter/test/test_exceptcomp.py
pypy/trunk/src/pypy/interpreter/test/test_exec.py
pypy/trunk/src/pypy/interpreter/test/test_extmodule.py
pypy/trunk/src/pypy/interpreter/test/test_function.py
pypy/trunk/src/pypy/interpreter/test/test_gateway.py
pypy/trunk/src/pypy/interpreter/test/test_generator.py
pypy/trunk/src/pypy/interpreter/test/test_interpreter.py
pypy/trunk/src/pypy/interpreter/test/test_main.py
pypy/trunk/src/pypy/interpreter/test/test_module.py
pypy/trunk/src/pypy/interpreter/test/test_nestedscope.py
pypy/trunk/src/pypy/interpreter/test/test_objspace.py
pypy/trunk/src/pypy/interpreter/test/test_pyframe.py
pypy/trunk/src/pypy/interpreter/unittest_w.py
pypy/trunk/src/pypy/module/test/test_apply.py
pypy/trunk/src/pypy/module/test/test_builtin.py
pypy/trunk/src/pypy/module/test/test_filter.py
pypy/trunk/src/pypy/module/test/test_functional.py
pypy/trunk/src/pypy/module/test/test_minmax.py
pypy/trunk/src/pypy/module/test/test_newstyleclasses.py
pypy/trunk/src/pypy/module/test/test_range.py
pypy/trunk/src/pypy/module/test/test_reduce.py
pypy/trunk/src/pypy/module/test/test_sysmodule.py
pypy/trunk/src/pypy/module/test/test_vars.py
pypy/trunk/src/pypy/module/test/test_zip.py
pypy/trunk/src/pypy/objspace/flow/test/test_framestate.py
pypy/trunk/src/pypy/objspace/flow/test/test_model.py
pypy/trunk/src/pypy/objspace/flow/test/test_objspace.py
pypy/trunk/src/pypy/objspace/std/test/test_boolobject.py
pypy/trunk/src/pypy/objspace/std/test/test_cpythonobject.py
pypy/trunk/src/pypy/objspace/std/test/test_dictobject.py
pypy/trunk/src/pypy/objspace/std/test/test_floatobject.py
pypy/trunk/src/pypy/objspace/std/test/test_instmethobject.py
pypy/trunk/src/pypy/objspace/std/test/test_intobject.py
pypy/trunk/src/pypy/objspace/std/test/test_iterobject.py
pypy/trunk/src/pypy/objspace/std/test/test_listobject.py
pypy/trunk/src/pypy/objspace/std/test/test_moduleobject.py
pypy/trunk/src/pypy/objspace/std/test/test_multimethod.py
pypy/trunk/src/pypy/objspace/std/test/test_noneobject.py
pypy/trunk/src/pypy/objspace/std/test/test_restricted_int.py
pypy/trunk/src/pypy/objspace/std/test/test_sliceobject.py
pypy/trunk/src/pypy/objspace/std/test/test_stdobjspace.py
pypy/trunk/src/pypy/objspace/std/test/test_stringobject.py
pypy/trunk/src/pypy/objspace/std/test/test_tupleobject.py
pypy/trunk/src/pypy/objspace/std/test/test_typeobject.py
pypy/trunk/src/pypy/objspace/std/test/test_userobject.py
pypy/trunk/src/pypy/objspace/test/test_traceobjspace.py
pypy/trunk/src/pypy/tool/newtest.py
pypy/trunk/src/pypy/tool/pydis.py
pypy/trunk/src/pypy/tool/testdata/test_dummy.py
pypy/trunk/src/pypy/tool/testit.py
pypy/trunk/src/pypy/tool/traceinteractive.py
pypy/trunk/src/pypy/tool/traceop.py
pypy/trunk/src/pypy/translator/test/test_annrpython.py
pypy/trunk/src/pypy/translator/test/test_cltrans.py
pypy/trunk/src/pypy/translator/test/test_pyrextrans.py
pypy/trunk/src/pypy/translator/test/test_sourcegen.py
pypy/trunk/src/pypy/translator/tool/benchmark.py
pypy/trunk/src/pypy/translator/tool/buildpyxmodule.py
pypy/trunk/src/pypy/translator/translator.py
Log:
fixed Stefan's somewhat optimistic test.py -> testit.py renaming.
Actually we have a lot of references to our test module (in all
of our test files) so they need fixing. And i don't like the
"testit" name so i will change that soon, i guess.
Modified: pypy/trunk/src/pypy/annotation/test/test_annset.py
==============================================================================
--- pypy/trunk/src/pypy/annotation/test/test_annset.py (original)
+++ pypy/trunk/src/pypy/annotation/test/test_annset.py Wed Dec 24 00:01:48 2003
@@ -1,6 +1,6 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.annotation.model import SomeValue, ANN, Predicate
from pypy.annotation.annset import AnnotationSet, mostgeneralvalue,impossiblevalue
@@ -32,7 +32,7 @@
return annset
-class TestAnnotationSet(test.IntTestCase):
+class TestAnnotationSet(testit.IntTestCase):
def assertSameSet(self, annset1, annset2):
self.assertEquals(repr(annset1), repr(annset2))
@@ -226,4 +226,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/appspace/builtin_functions_test.py
==============================================================================
--- pypy/trunk/src/pypy/appspace/builtin_functions_test.py (original)
+++ pypy/trunk/src/pypy/appspace/builtin_functions_test.py Wed Dec 24 00:01:48 2003
@@ -1,6 +1,6 @@
# Python test set -- built-in functions
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.interpreter.gateway import app2interp
def app_init_globals():
@@ -105,13 +105,13 @@
b.L = L
-class BuiltinTest(test.AppTestCase):
+class BuiltinTest(testit.AppTestCase):
full_test = 1
fully_initialized = False
def setUp(self):
- self.space = space = test.objspace('std')
+ self.space = space = testit.objspace('std')
if self.fully_initialized:
return
@@ -1240,4 +1240,4 @@
self.assertRaises(ValueError, zip, BadSeq(), BadSeq())
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/appspace/test/test_cmathmodule.py
==============================================================================
--- pypy/trunk/src/pypy/appspace/test/test_cmathmodule.py (original)
+++ pypy/trunk/src/pypy/appspace/test/test_cmathmodule.py Wed Dec 24 00:01:48 2003
@@ -16,7 +16,7 @@
import autopath
#try:
-from pypy.tool import test
+from pypy.tool import testit
from pypy.appspace import cmathmodule
from pypy.appspace.complexobject import complex as pycomplex
#except ImportError:
@@ -28,7 +28,7 @@
if 0: # DISABLED -- we know it works all right and don't want to see them
# take time any more for the time being
- class TestCMathModule(test.TestCase):
+ class TestCMathModule(testit.TestCase):
def assertAEqual(self, a, b):
if not equal(a, b):
@@ -70,4 +70,4 @@
if __name__ == "__main__":
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/appspace/test/test_complexobject.py
==============================================================================
--- pypy/trunk/src/pypy/appspace/test/test_complexobject.py (original)
+++ pypy/trunk/src/pypy/appspace/test/test_complexobject.py Wed Dec 24 00:01:48 2003
@@ -18,7 +18,7 @@
import types
import unittest
-from pypy.tool import test
+from pypy.tool import testit
from pypy.appspace.complexobject import complex as pycomplex
Modified: pypy/trunk/src/pypy/appspace/test/test_stringmodule.py
==============================================================================
--- pypy/trunk/src/pypy/appspace/test/test_stringmodule.py (original)
+++ pypy/trunk/src/pypy/appspace/test/test_stringmodule.py Wed Dec 24 00:01:48 2003
@@ -10,7 +10,7 @@
import unittest
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.appspace import string as pypy_string
class TestStringmodule(unittest.TestCase):
@@ -36,4 +36,4 @@
if __name__ == "__main__":
- test.main()
\ No newline at end of file
+ testit.main()
\ No newline at end of file
Modified: pypy/trunk/src/pypy/interpreter/interactive.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/interactive.py (original)
+++ pypy/trunk/src/pypy/interpreter/interactive.py Wed Dec 24 00:01:48 2003
@@ -75,7 +75,7 @@
pass
from pypy.tool import option
- from pypy.tool import test
+ from pypy.tool import testit
args = option.process_options(option.get_standard_options(),
option.Options)
objspace = option.objspace()
Modified: pypy/trunk/src/pypy/interpreter/test/test_class.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_class.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_class.py Wed Dec 24 00:01:48 2003
@@ -1,8 +1,8 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestClassApp(test.AppTestCase):
+class TestClassApp(testit.AppTestCase):
def test_class(self):
@@ -64,4 +64,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_code.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_code.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_code.py Wed Dec 24 00:01:48 2003
@@ -1,10 +1,10 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
import unittest
-class AppTestCodeIntrospection(test.AppTestCase):
+class AppTestCodeIntrospection(testit.AppTestCase):
def test_attributes(self):
def f(): pass
code = f.func_code
@@ -17,4 +17,4 @@
self.assertEquals(code.co_argcount,0)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_eval.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_eval.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_eval.py Wed Dec 24 00:01:48 2003
@@ -1,13 +1,13 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.interpreter.eval import Frame, UNDEFINED
from pypy.interpreter.pycode import PyCode
-class TestFrame(test.IntTestCase):
+class TestFrame(testit.IntTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
def c(x, y, *args):
pass
code = PyCode()._from_code(c.func_code)
@@ -55,4 +55,4 @@
UNDEFINED, UNDEFINED])
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_exceptcomp.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_exceptcomp.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_exceptcomp.py Wed Dec 24 00:01:48 2003
@@ -3,12 +3,12 @@
New for PyPy - Could be incorporated into CPython regression tests.
"""
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestExceptionComp(test.AppTestCase):
+class TestExceptionComp(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
### XXX - String exceptions depreciated?
## def test_string(self):
@@ -135,4 +135,4 @@
self.fail("Exception does not match self in deeply nested tuple.")
if __name__ == "__main__":
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_exec.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_exec.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_exec.py Wed Dec 24 00:01:48 2003
@@ -3,12 +3,12 @@
New for PyPy - Could be incorporated into CPython regression tests.
"""
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestExecStmt(test.AppTestCase):
+class TestExecStmt(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
def test_string(self):
g = {}
@@ -73,4 +73,4 @@
self.failUnlessRaises(TypeError,f)
if __name__ == "__main__":
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_extmodule.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_extmodule.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_extmodule.py Wed Dec 24 00:01:48 2003
@@ -1,12 +1,12 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.interpreter.extmodule import ExtModule
-class TestExtModule(test.IntTestCase):
+class TestExtModule(testit.IntTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
class M(ExtModule):
__name__ = 'm'
@@ -44,4 +44,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_function.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_function.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_function.py Wed Dec 24 00:01:48 2003
@@ -1,12 +1,12 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
import unittest
from pypy.interpreter.function import Function, Method
from pypy.interpreter.pycode import PyCode
-class AppTestFunctionIntrospection(test.AppTestCase):
+class AppTestFunctionIntrospection(testit.AppTestCase):
def test_attributes(self):
def f(): pass
self.assert_(hasattr(f, 'func_code'))
@@ -30,7 +30,7 @@
self.assert_(f.__dict__ is f.func_dict)
#XXX self.assert_(hasattr(f, '__class__'))
-class AppTestFunction(test.AppTestCase):
+class AppTestFunction(testit.AppTestCase):
def test_simple_call(self):
def func(arg1, arg2):
return arg1, arg2
@@ -108,9 +108,9 @@
self.assertRaises(TypeError, func, 42, **{'arg1': 23})
-class TestMethod(test.IntTestCase):
+class TestMethod(testit.IntTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
def c(self, bar):
return bar
code = PyCode()._from_code(c.func_code)
@@ -137,4 +137,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_gateway.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_gateway.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_gateway.py Wed Dec 24 00:01:48 2003
@@ -1,12 +1,12 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.interpreter import gateway
-class TestBuiltinCode(test.IntTestCase):
+class TestBuiltinCode(testit.IntTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
def test_signature(self):
def c(space, w_x, w_y, *args_w, **kw_w):
@@ -35,9 +35,9 @@
self.assertEqual_w(w_result, w(1020))
-class TestGateway(test.IntTestCase):
+class TestGateway(testit.IntTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
def test_app2interp(self):
w = self.space.wrap
@@ -81,4 +81,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_generator.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_generator.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_generator.py Wed Dec 24 00:01:48 2003
@@ -1,8 +1,8 @@
from __future__ import generators
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class AppTestGenerator(test.AppTestCase):
+class AppTestGenerator(testit.AppTestCase):
def test_generator(self):
def f():
@@ -51,4 +51,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_interpreter.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_interpreter.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_interpreter.py Wed Dec 24 00:01:48 2003
@@ -1,7 +1,7 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestInterpreter(test.TestCase):
+class TestInterpreter(testit.TestCase):
def codetest(self, source, functionname, args):
"""Compile and run the given code string, and then call its function
@@ -35,7 +35,7 @@
return space.unwrap(w_output)
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
def test_exception_trivial(self):
x = self.codetest('''
@@ -143,7 +143,7 @@
self.assertEquals(self.codetest(code, 'f', [9]),
1+2+3 + 5+6+7+8+900)
-class AppTestInterpreter(test.AppTestCase):
+class AppTestInterpreter(testit.AppTestCase):
def test_exception(self):
try:
raise Exception, 1
@@ -215,4 +215,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_main.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_main.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_main.py Wed Dec 24 00:01:48 2003
@@ -2,7 +2,7 @@
import autopath
from cStringIO import StringIO
-from pypy.tool import test
+from pypy.tool import testit
from pypy.interpreter.baseobjspace import OperationError
from pypy.interpreter import main
@@ -20,7 +20,7 @@
capture = StringIO()
def checkoutput(expected_output,f,*args):
- space = test.objspace()
+ space = testit.objspace()
w_sys = space.get_builtin_module("sys")
w_oldout = space.getattr(w_sys, space.wrap("stdout"))
capture.reset()
@@ -34,10 +34,10 @@
testfn = 'tmp_hello_world.py'
-class TestMain(test.TestCase):
+class TestMain(testit.TestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
ofile = open(testfn, 'w')
ofile.write(testcode)
ofile.close()
@@ -58,4 +58,4 @@
self.assertEqual_w(w_x, self.space.wrap(4))
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_module.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_module.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_module.py Wed Dec 24 00:01:48 2003
@@ -1,12 +1,12 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.interpreter.module import Module
-class TestModule(test.IntTestCase):
+class TestModule(testit.IntTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
self.m = Module(self.space, self.space.wrap('m'))
def test_name(self):
@@ -23,10 +23,10 @@
self.assertRaises_w(self.space.w_AttributeError,
self.space.delattr, w_m, w('x'))
-class Test_ModuleObject(test.AppTestCase):
+class Test_ModuleObject(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
def test_attr(self):
m = __import__('__builtin__')
@@ -44,4 +44,4 @@
self.assertRaises(AttributeError, delattr, m, 'x')
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_nestedscope.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_nestedscope.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_nestedscope.py Wed Dec 24 00:01:48 2003
@@ -1,8 +1,8 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class AppTestNestedScope(test.AppTestCase):
+class AppTestNestedScope(testit.AppTestCase):
def test_nested_scope(self):
x = 42
@@ -58,4 +58,4 @@
self.assertEquals(len(outer_locals), 1, "len!=1 for %r" % outer_locals)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_objspace.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_objspace.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_objspace.py Wed Dec 24 00:01:48 2003
@@ -1,13 +1,13 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
# this test isn't so much to test that the objspace interface *works*
# -- it's more to test that it's *there*
-class TestObjSpace(test.TestCase):
+class TestObjSpace(testit.TestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
def tearDown(self):
pass
@@ -94,9 +94,9 @@
self.failIf(self.space.exception_match(self.space.w_ValueError,
self.space.w_LookupError))
-class ModuleMinimalTest(test.IntTestCase):
+class ModuleMinimalTest(testit.IntTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
def test_sys_exists(self):
w_sys = self.space.get_builtin_module('sys')
@@ -115,4 +115,4 @@
run_string('import sys', space=self.space)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/test/test_pyframe.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/test_pyframe.py (original)
+++ pypy/trunk/src/pypy/interpreter/test/test_pyframe.py Wed Dec 24 00:01:48 2003
@@ -1,8 +1,8 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class AppTestPyFrame(test.AppTestCase):
+class AppTestPyFrame(testit.AppTestCase):
# test for the presence of the attributes, not functionality
@@ -30,4 +30,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/interpreter/unittest_w.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/unittest_w.py (original)
+++ pypy/trunk/src/pypy/interpreter/unittest_w.py Wed Dec 24 00:01:48 2003
@@ -70,7 +70,7 @@
errorfn(self, self._TestCase__exc_info())
def __call__(self, result=None):
- from pypy.tool.test import TestSkip
+ from pypy.tool.testit import TestSkip
if result is None: result = self.defaultTestResult()
result.startTest(self)
testMethod = getattr(self, self.methodName)
@@ -161,5 +161,5 @@
return IntTestCase.__call__(self, result)
def setUp(self):
- from pypy.tool import test
- self.space = test.objspace()
+ from pypy.tool import testit
+ self.space = testit.objspace()
Modified: pypy/trunk/src/pypy/module/test/test_apply.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_apply.py (original)
+++ pypy/trunk/src/pypy/module/test/test_apply.py Wed Dec 24 00:01:48 2003
@@ -1,11 +1,11 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
# This is a very trivial series of tests. If apply is subtlely broken,
# we will have to find out some other way.
-class TestApply(test.AppTestCase):
+class TestApply(testit.AppTestCase):
def test_trivial_listonly(self):
def mymin(*args):
@@ -28,6 +28,6 @@
(-4))
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/module/test/test_builtin.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_builtin.py (original)
+++ pypy/trunk/src/pypy/module/test/test_builtin.py Wed Dec 24 00:01:48 2003
@@ -1,10 +1,10 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestBuiltinApp(test.AppTestCase):
+class TestBuiltinApp(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
def test_import(self):
m = __import__('pprint')
@@ -229,10 +229,10 @@
-class TestInternal(test.IntTestCase):
+class TestInternal(testit.IntTestCase):
def setUp(self):
- self.space = space = test.objspace()
+ self.space = space = testit.objspace()
def get_builtin(self, name):
w = self.space.wrap
@@ -261,5 +261,5 @@
os.remove(fn)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/module/test/test_filter.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_filter.py (original)
+++ pypy/trunk/src/pypy/module/test/test_filter.py Wed Dec 24 00:01:48 2003
@@ -1,9 +1,9 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
# trivial functions for testing
-class TestFilter(test.AppTestCase):
+class TestFilter(testit.AppTestCase):
def test_filter_no_arguments(self):
self.assertRaises(TypeError, filter)
@@ -38,4 +38,4 @@
self.assertEqual(filter(lambda x: x>'a', 'xyzabcd'), 'xyzbcd')
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/module/test/test_functional.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_functional.py (original)
+++ pypy/trunk/src/pypy/module/test/test_functional.py Wed Dec 24 00:01:48 2003
@@ -1,8 +1,8 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestMap(test.AppTestCase):
+class TestMap(testit.AppTestCase):
def test_trivial_map_one_seq(self):
self.assertEqual(map(lambda x: x+2, [1, 2, 3, 4]), [3, 4, 5, 6])
@@ -59,14 +59,14 @@
b = []
self.assertEqual(map(lambda x, y: x, a, b), a)
-class TestZip(test.AppTestCase):
+class TestZip(testit.AppTestCase):
def test_one_list(self):
self.assertEqual(zip([1,2,3]), [(1,), (2,), (3,)])
def test_three_lists(self):
self.assertEqual(zip([1,2,3], [1,2], [1,2,3]), [(1,1,1), (2,2,2)])
-class TestReduce(test.TestCase):
+class TestReduce(testit.TestCase):
def test_None(self):
self.assertRaises(TypeError, reduce, lambda x, y: x+y, [1,2,3], None)
@@ -78,7 +78,7 @@
self.assertEqual(reduce(lambda x, y: x-y, [10, 2, 8]), 0)
self.assertEqual(reduce(lambda x, y: x-y, [2, 8], 10), 0)
-class TestFilter(test.AppTestCase):
+class TestFilter(testit.AppTestCase):
def test_None(self):
self.assertEqual(filter(None, ['a', 'b', 1, 0, None]), ['a', 'b', 1])
@@ -92,6 +92,6 @@
self.assertEqual(filter(lambda x: x != "a", "a small text"), " smll text")
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/module/test/test_minmax.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_minmax.py (original)
+++ pypy/trunk/src/pypy/module/test/test_minmax.py Wed Dec 24 00:01:48 2003
@@ -1,7 +1,7 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestMin(test.AppTestCase):
+class TestMin(testit.AppTestCase):
def test_min_notseq(self):
self.assertRaises(TypeError, min, 1)
@@ -34,7 +34,7 @@
def test_min_empty(self):
self.assertRaises(ValueError, min, [])
-class TestMax(test.AppTestCase):
+class TestMax(testit.AppTestCase):
def test_max_notseq(self):
self.assertRaises(TypeError, max, 1)
@@ -68,4 +68,4 @@
self.assertRaises(ValueError, max, [])
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/module/test/test_newstyleclasses.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_newstyleclasses.py (original)
+++ pypy/trunk/src/pypy/module/test/test_newstyleclasses.py Wed Dec 24 00:01:48 2003
@@ -1,10 +1,10 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestBuiltinApp(test.AppTestCase):
+class TestBuiltinApp(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
def test_staticmethod(self):
class C:
@@ -49,4 +49,4 @@
self.assertRaises(KeyError, delattr, a1, 'name')
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/module/test/test_range.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_range.py (original)
+++ pypy/trunk/src/pypy/module/test/test_range.py Wed Dec 24 00:01:48 2003
@@ -1,7 +1,7 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestRange(test.AppTestCase):
+class TestRange(testit.AppTestCase):
def test_range_toofew(self):
self.assertRaises(TypeError, range)
@@ -68,6 +68,6 @@
"""
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/module/test/test_reduce.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_reduce.py (original)
+++ pypy/trunk/src/pypy/module/test/test_reduce.py Wed Dec 24 00:01:48 2003
@@ -1,7 +1,7 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestReduce(test.AppTestCase):
+class TestReduce(testit.AppTestCase):
def test_None(self):
self.assertRaises(TypeError, reduce, lambda x, y: x+y, [1,2,3], None)
@@ -14,6 +14,6 @@
self.assertEqual(reduce(lambda x, y: x-y, [2, 8], 10), 0)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/module/test/test_sysmodule.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_sysmodule.py (original)
+++ pypy/trunk/src/pypy/module/test/test_sysmodule.py Wed Dec 24 00:01:48 2003
@@ -1,9 +1,9 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class SysTests(test.TestCase):
+class SysTests(testit.TestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
self.sys_w = self.space.get_builtin_module("sys")
def tearDown(self):
pass
@@ -12,7 +12,7 @@
s = self.space
self.failUnless_w(s.getattr(self.sys_w, s.wrap("stdout")))
-class AppSysTests(test.AppTestCase):
+class AppSysTests(testit.AppTestCase):
def test_path_exists(self):
import sys
self.failUnless(hasattr(sys, 'path'), "sys.path gone missing")
@@ -66,5 +66,5 @@
"__builtin__ is not listed as a builtin module.")
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/module/test/test_vars.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_vars.py (original)
+++ pypy/trunk/src/pypy/module/test/test_vars.py Wed Dec 24 00:01:48 2003
@@ -1,7 +1,7 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestVars(test.AppTestCase):
+class TestVars(testit.AppTestCase):
def _test_vars_no_arguments(self):
self.assertEqual(vars(), locals())
@@ -19,6 +19,6 @@
self.assertEqual(vars(a1).get('res'),42)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/module/test/test_zip.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_zip.py (original)
+++ pypy/trunk/src/pypy/module/test/test_zip.py Wed Dec 24 00:01:48 2003
@@ -1,7 +1,7 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestZip(test.AppTestCase):
+class TestZip(testit.AppTestCase):
def test_zip_no_arguments(self):
self.assertRaises(TypeError, zip)
@@ -32,6 +32,6 @@
[('h', 1, 7), ('e', 2, 8), ('l', 3, 9), ('l', 4, 10)])
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/flow/test/test_framestate.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/flow/test/test_framestate.py (original)
+++ pypy/trunk/src/pypy/objspace/flow/test/test_framestate.py Wed Dec 24 00:01:48 2003
@@ -1,14 +1,14 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.objspace.flow.flowcontext import *
from pypy.objspace.flow.model import *
from pypy.interpreter.pycode import PyCode
-class TestFrameState(test.TestCase):
+class TestFrameState(testit.TestCase):
def setUp(self):
- self.space = test.objspace('flow')
+ self.space = testit.objspace('flow')
def getframe(self, func):
space = self.space
@@ -99,7 +99,7 @@
self.assert_(isinstance(frame.fastlocals_w[-1], Variable)) # generalized
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/flow/test/test_model.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/flow/test/test_model.py (original)
+++ pypy/trunk/src/pypy/objspace/flow/test/test_model.py Wed Dec 24 00:01:48 2003
@@ -1,11 +1,11 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.objspace.flow.model import *
-class TestModel(test.TestCase):
+class TestModel(testit.TestCase):
def setUp(self):
- self.space = test.objspace('flow')
+ self.space = testit.objspace('flow')
def getflow(self, func):
import inspect
@@ -81,4 +81,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/flow/test/test_objspace.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/flow/test/test_objspace.py (original)
+++ pypy/trunk/src/pypy/objspace/flow/test/test_objspace.py Wed Dec 24 00:01:48 2003
@@ -1,12 +1,12 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.objspace.flow.wrapper import *
from pypy.translator.flowmodel import *
-class TestFlowOjSpace(test.TestCase):
+class TestFlowOjSpace(testit.TestCase):
def setUp(self):
- self.space = test.objspace('flow')
+ self.space = testit.objspace('flow')
def codetest(self, func):
import inspect
@@ -216,4 +216,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_boolobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_boolobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_boolobject.py Wed Dec 24 00:01:48 2003
@@ -1,11 +1,11 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestW_BoolObject(test.TestCase):
+class TestW_BoolObject(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
self.true = self.space.w_True
self.false = self.space.w_False
self.wrap = self.space.wrap
@@ -23,9 +23,9 @@
def test_false(self):
self.failIf_w(self.false)
-class AppBoolTest(test.AppTestCase):
+class AppBoolTest(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def test_bool_callable(self):
self.assertEquals(True, bool(1))
@@ -39,4 +39,4 @@
self.assertEquals("False", repr(False))
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_cpythonobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_cpythonobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_cpythonobject.py Wed Dec 24 00:01:48 2003
@@ -1,14 +1,14 @@
import unittest, sys, array
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.objspace.std import cpythonobject
from pypy.objspace.std.objspace import OperationError
-class TestW_CPythonObject(test.TestCase):
+class TestW_CPythonObject(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
# arbitrary always-wrapped object
self.stuff = array.array('b', [5,-2,77])
@@ -88,4 +88,4 @@
self.assertEqual_w(self.space.wrap(5), self.space.next(nx))
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_dictobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_dictobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_dictobject.py Wed Dec 24 00:01:48 2003
@@ -1,12 +1,12 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.objspace.std.dictobject import W_DictObject
-class TestW_DictObject(test.TestCase):
+class TestW_DictObject(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def tearDown(self):
pass
@@ -168,10 +168,10 @@
-class Test_DictObject(test.AppTestCase):
+class Test_DictObject(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def test_equality(self):
d = {1:2}
@@ -347,4 +347,4 @@
{1: 'j', '1': 'j'})
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_floatobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_floatobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_floatobject.py Wed Dec 24 00:01:48 2003
@@ -1,12 +1,12 @@
import autopath
from pypy.objspace.std import floatobject as fobj
from pypy.objspace.std.objspace import FailedToImplement
-from pypy.tool import test
+from pypy.tool import testit
-class TestW_FloatObject(test.TestCase):
+class TestW_FloatObject(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def tearDown(self):
pass
@@ -44,9 +44,9 @@
self.space, f1, f2,
self.space.w_None))
-class AppFloatTest(test.AppTestCase):
+class AppFloatTest(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def test_negatives(self):
self.assert_(-1.1 < 0)
@@ -75,5 +75,5 @@
self.assertEquals(0.0, round(22.22222, -2))
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_instmethobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_instmethobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_instmethobject.py Wed Dec 24 00:01:48 2003
@@ -1,12 +1,12 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
# NB. instmethobject.py has been removed,
# but the following tests still make sense
-class TestInstMethObjectApp(test.AppTestCase):
+class TestInstMethObjectApp(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def test_callBound(self):
boundMethod = [1,2,3].__len__
@@ -20,4 +20,4 @@
self.assertRaises(TypeError, unboundMethod, [1,2,3], 333)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_intobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_intobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_intobject.py Wed Dec 24 00:01:48 2003
@@ -2,12 +2,12 @@
import autopath
from pypy.objspace.std import intobject as iobj
from pypy.objspace.std.objspace import FailedToImplement
-from pypy.tool import test
+from pypy.tool import testit
-class TestW_IntObject(test.TestCase):
+class TestW_IntObject(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def tearDown(self):
pass
@@ -288,9 +288,9 @@
result = iobj.hex__Int(self.space, f1)
self.assertEquals(self.space.unwrap(result), hex(x))
-class AppIntTest(test.AppTestCase):
+class AppIntTest(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def test_int_callable(self):
self.assertEquals(42, int(42))
@@ -314,4 +314,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_iterobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_iterobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_iterobject.py Wed Dec 24 00:01:48 2003
@@ -1,12 +1,12 @@
import autopath
from pypy.objspace.std.iterobject import W_SeqIterObject
from pypy.objspace.std.objspace import NoValue
-from pypy.tool import test
+from pypy.tool import testit
-class TestW_IterObject(test.TestCase):
+class TestW_IterObject(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def tearDown(self):
pass
@@ -44,9 +44,9 @@
w_iter = self.space.iter(w_list)
self.body0(w_iter)
-class TestW_IterObjectApp(test.AppTestCase):
+class TestW_IterObjectApp(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def test_user_iter(self):
class C:
@@ -71,4 +71,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_listobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_listobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_listobject.py Wed Dec 24 00:01:48 2003
@@ -2,13 +2,13 @@
import autopath
from pypy.objspace.std.listobject import W_ListObject
from pypy.objspace.std.objspace import NoValue
-from pypy.tool import test
+from pypy.tool import testit
-class TestW_ListObject(test.TestCase):
+class TestW_ListObject(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def tearDown(self):
pass
@@ -271,9 +271,9 @@
self.assertEqual_w(self.space.le(w_list4, w_list3),
self.space.w_True)
-class AppTestW_ListObject(test.AppTestCase):
+class AppTestW_ListObject(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def test_explicit_new_init(self):
l = list.__new__(list)
@@ -327,4 +327,4 @@
self.assertEquals(l,[3])
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_moduleobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_moduleobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_moduleobject.py Wed Dec 24 00:01:48 2003
@@ -1,11 +1,11 @@
import autopath
from pypy.objspace.std.moduleobject import W_ModuleObject
-from pypy.tool import test
+from pypy.tool import testit
-class TestW_ModuleObject(test.TestCase):
+class TestW_ModuleObject(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def tearDown(self):
pass
@@ -31,4 +31,4 @@
self.assertEqual_w(space.getattr(w_m, space.wrap('yy')), w_yy)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_multimethod.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_multimethod.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_multimethod.py Wed Dec 24 00:01:48 2003
@@ -1,7 +1,7 @@
import autopath
from pypy.objspace.std.multimethod import *
-from pypy.tool import test
+from pypy.tool import testit
BoundMultiMethod.ASSERT_BASE_TYPE = object
@@ -90,10 +90,10 @@
return x
-class TestMultiMethod(test.TestCase):
+class TestMultiMethod(testit.TestCase):
def setUp(self):
# only run when testing stdobjectspace
- #XXX removed: test.objspace('std')
+ #XXX removed: testit.objspace('std')
self.space = FakeObjSpace()
def test_non_delegate(self):
@@ -146,4 +146,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_noneobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_noneobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_noneobject.py Wed Dec 24 00:01:48 2003
@@ -1,11 +1,11 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestW_NoneObject(test.TestCase):
+class TestW_NoneObject(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def tearDown(self):
pass
@@ -22,4 +22,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_restricted_int.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_restricted_int.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_restricted_int.py Wed Dec 24 00:01:48 2003
@@ -1,12 +1,12 @@
import unittest
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.objspace.std.restricted_int import *
-class Test_r_int(test.TestCase):
+class Test_r_int(testit.TestCase):
def setUp(self):
- space = test.objspace('std')
+ space = testit.objspace('std')
def tearDown(self):
pass
@@ -63,10 +63,10 @@
cmp = f(left(larg), right(rarg))
self.assertEquals(res, cmp)
-class Test_r_uint(test.TestCase):
+class Test_r_uint(testit.TestCase):
def setUp(self):
- space = test.objspace('std')
+ space = testit.objspace('std')
def tearDown(self):
pass
@@ -130,4 +130,4 @@
self.assertEquals(res, cmp)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_sliceobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_sliceobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_sliceobject.py Wed Dec 24 00:01:48 2003
@@ -1,10 +1,10 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestW_SliceObject(test.TestCase):
+class TestW_SliceObject(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def tearDown(self):
pass
@@ -35,9 +35,9 @@
self.assertRaises_w(space.w_ValueError,
slicetype.indices3, space, w_slice, 10)
-class Test_SliceObject(test.AppTestCase):
+class Test_SliceObject(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def test_new(self):
def cmp_slice(sl1, sl2):
@@ -59,4 +59,4 @@
self.assertEqual(slice(11,4,-2).indices(2), (1, 2, -2))
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_stdobjspace.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_stdobjspace.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_stdobjspace.py Wed Dec 24 00:01:48 2003
@@ -1,10 +1,10 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestW_StdObjSpace(test.TestCase):
+class TestW_StdObjSpace(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def tearDown(self):
pass
@@ -20,4 +20,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_stringobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_stringobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_stringobject.py Wed Dec 24 00:01:48 2003
@@ -1,14 +1,14 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.objspace.std import stringobject
from pypy.objspace.std.stringobject import \
string_richcompare, W_StringObject, EQ, LT, GT, NE, LE, GE
-class TestW_StringObject(test.TestCase):
+class TestW_StringObject(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def tearDown(self):
pass
@@ -114,9 +114,9 @@
w_slice = space.newslice(w(1), w_None, w(2))
self.assertEqual_w(space.getitem(w_str, w_slice), w('el'))
-class TestStringObject(test.AppTestCase):
+class TestStringObject(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def test_split(self):
self.assertEquals("".split(), [])
@@ -472,4 +472,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_tupleobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_tupleobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_tupleobject.py Wed Dec 24 00:01:48 2003
@@ -1,14 +1,14 @@
#from __future__ import nested_scopes
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.objspace.std.tupleobject import W_TupleObject
from pypy.objspace.std.objspace import NoValue
-class TestW_TupleObject(test.TestCase):
+class TestW_TupleObject(testit.TestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def tearDown(self):
pass
@@ -240,4 +240,4 @@
self.space.w_True)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_typeobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_typeobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_typeobject.py Wed Dec 24 00:01:48 2003
@@ -1,10 +1,10 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-##class TestSpecialMultimethodCode(test.TestCase):
+##class TestSpecialMultimethodCode(testit.TestCase):
## def setUp(self):
-## self.space = test.objspace('std')
+## self.space = testit.objspace('std')
## def tearDown(self):
## pass
@@ -53,9 +53,9 @@
## w({'x1': 5.5, 'x2': 7})),
## w(-1.5))
-class TestTypeObject(test.AppTestCase):
+class TestTypeObject(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def test_bases(self):
self.assertEquals(int.__bases__, (object,))
@@ -90,4 +90,4 @@
"c": 3}))
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/std/test/test_userobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_userobject.py (original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_userobject.py Wed Dec 24 00:01:48 2003
@@ -1,9 +1,9 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
-class TestUserObject(test.AppTestCase):
+class TestUserObject(testit.AppTestCase):
def setUp(self):
- self.space = test.objspace('std')
+ self.space = testit.objspace('std')
def test_emptyclass(self):
class empty: pass
@@ -98,4 +98,4 @@
self.assertEquals(c1("hello", "world"), ("hello", "world"))
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/objspace/test/test_traceobjspace.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/test/test_traceobjspace.py (original)
+++ pypy/trunk/src/pypy/objspace/test/test_traceobjspace.py Wed Dec 24 00:01:48 2003
@@ -1,13 +1,13 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.objspace.trace import TraceObjSpace
from pypy.interpreter.gateway import app2interp
from pypy.tool import pydis
-class Test_TraceObjSpace(test.IntTestCase):
+class Test_TraceObjSpace(testit.IntTestCase):
def setUp(self):
- self.space = test.objspace()
+ self.space = testit.objspace()
def tearDown(self):
pass
@@ -61,4 +61,4 @@
#self.assertEquals_w(op.args_w, expected_w)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/tool/newtest.py
==============================================================================
--- pypy/trunk/src/pypy/tool/newtest.py (original)
+++ pypy/trunk/src/pypy/tool/newtest.py Wed Dec 24 00:01:48 2003
@@ -596,10 +596,10 @@
# possibly ignore dummy unit tests
if do_selftest:
# include only selftest module
- filterfunc = lambda m: m.find("pypy.tool.testdata.") != -1
+ filterfunc = lambda m: m.find("pypy.tool.testitdata.") != -1
else:
# exclude selftest module
- filterfunc = lambda m: m.find("pypy.tool.testdata.") == -1
+ filterfunc = lambda m: m.find("pypy.tool.testitdata.") == -1
# collect tests
suite = TestSuite()
print "Loading test modules ..."
Modified: pypy/trunk/src/pypy/tool/pydis.py
==============================================================================
--- pypy/trunk/src/pypy/tool/pydis.py (original)
+++ pypy/trunk/src/pypy/tool/pydis.py Wed Dec 24 00:01:48 2003
@@ -55,8 +55,8 @@
elif op in hascompare:
s += '(' + cmp_op[oparg] + ')'
elif op in hasfree:
- if free is None:
- free = co.co_cellvars + co.co_freevars
+ #if free is None:
+ free = co.co_cellvars + co.co_freevars
s += '(' + free[oparg] + ')'
return s
Modified: pypy/trunk/src/pypy/tool/testdata/test_dummy.py
==============================================================================
--- pypy/trunk/src/pypy/tool/testdata/test_dummy.py (original)
+++ pypy/trunk/src/pypy/tool/testdata/test_dummy.py Wed Dec 24 00:01:48 2003
@@ -11,7 +11,7 @@
newtest.service.skip()
-class TestDummy1(newtest.TestCase):
+class TestDummy1(newtestit.TestCase):
"""
Example of a docstring for a class.
"""
@@ -25,7 +25,7 @@
raise self.fail("fail deliberately in test_failure1")
-class TestDummy2(newtest.TestCase):
+class TestDummy2(newtestit.TestCase):
def test_success2(self):
self.assertEquals(1+1, 2)
@@ -37,7 +37,7 @@
raise self.fail("fail deliberately in test_failure2")
-class TestSkip1(newtest.TestCase):
+class TestSkip1(newtestit.TestCase):
def setUp(self):
self.skip()
@@ -45,7 +45,7 @@
pass
-class TestSkip2(newtest.TestCase):
+class TestSkip2(newtestit.TestCase):
def test_skip2(self):
self.skip()
@@ -61,4 +61,4 @@
if __name__ == '__main__':
- newtest.main()
+ newtestit.main()
Modified: pypy/trunk/src/pypy/tool/testit.py
==============================================================================
--- pypy/trunk/src/pypy/tool/testit.py (original)
+++ pypy/trunk/src/pypy/tool/testit.py Wed Dec 24 00:01:48 2003
@@ -94,7 +94,7 @@
def interact(self):
efs = self.errors + self.failures
- from pypy.tool.testpm import TestPM
+ from pypy.tool.testitpm import TestPM
c = TestPM(efs)
c.cmdloop()
Modified: pypy/trunk/src/pypy/tool/traceinteractive.py
==============================================================================
--- pypy/trunk/src/pypy/tool/traceinteractive.py (original)
+++ pypy/trunk/src/pypy/tool/traceinteractive.py Wed Dec 24 00:01:48 2003
@@ -173,7 +173,7 @@
if __name__ == '__main__':
from pypy.tool import option
- from pypy.tool import test
+ from pypy.tool import testit
args = option.process_options(option.get_standard_options(),
option.Options)
Modified: pypy/trunk/src/pypy/tool/traceop.py
==============================================================================
--- pypy/trunk/src/pypy/tool/traceop.py (original)
+++ pypy/trunk/src/pypy/tool/traceop.py Wed Dec 24 00:01:48 2003
@@ -78,7 +78,7 @@
print line_begin(frame_count) + ("<<<<<leave %s >>>>>>>" % lastframe)
elif isinstance(event, trace.ExecBytecode):
disresult = getdisresult(event.frame)
- print line_begin(frame_count), event.index, " ", disresult.getbytecode(event.index)
+ print line_begin(frame_count), "%2d" % event.index, " ", disresult.getbytecode(event.index)
lastframe = event.frame
elif isinstance(event, trace.CallBegin):
@@ -260,7 +260,7 @@
## ## pass
## ## from pypy.tool import option
-## ## from pypy.tool import test
+## ## from pypy.tool import testit
## ## args = option.process_options(option.get_standard_options(),
## ## option.Options)
## ## objspace = option.objspace()
Modified: pypy/trunk/src/pypy/translator/test/test_annrpython.py
==============================================================================
--- pypy/trunk/src/pypy/translator/test/test_annrpython.py (original)
+++ pypy/trunk/src/pypy/translator/test/test_annrpython.py Wed Dec 24 00:01:48 2003
@@ -1,6 +1,6 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.tool.udir import udir
from pypy.translator.annrpython import RPythonAnnotator, ANN
@@ -9,9 +9,9 @@
from pypy.translator.test import snippet
-class AnnonateTestCase(test.IntTestCase):
+class AnnonateTestCase(testit.IntTestCase):
def setUp(self):
- self.space = test.objspace('flow')
+ self.space = testit.objspace('flow')
def make_fun(self, func):
import inspect
@@ -165,4 +165,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/translator/test/test_cltrans.py
==============================================================================
--- pypy/trunk/src/pypy/translator/test/test_cltrans.py (original)
+++ pypy/trunk/src/pypy/translator/test/test_cltrans.py Wed Dec 24 00:01:48 2003
@@ -1,5 +1,5 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.tool.udir import udir
@@ -39,11 +39,11 @@
from pypy.translator.test import snippet as t
from pypy.translator.tool.buildcl import Literal
-class GenCLTestCase(test.IntTestCase):
+class GenCLTestCase(testit.IntTestCase):
def setUp(self):
if not global_cl:
- raise (test.TestSkip,
+ raise (testit.TestSkip,
"Common Lisp neither configured nor detected.")
def test_if(self):
@@ -134,4 +134,4 @@
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/translator/test/test_pyrextrans.py
==============================================================================
--- pypy/trunk/src/pypy/translator/test/test_pyrextrans.py (original)
+++ pypy/trunk/src/pypy/translator/test/test_pyrextrans.py Wed Dec 24 00:01:48 2003
@@ -1,5 +1,5 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.tool.udir import udir
from pypy.translator.genpyrex import GenPyrex
from pypy.objspace.flow.model import *
@@ -7,16 +7,16 @@
from pypy.translator.test import snippet as t
-class TypedPyrexGenTestCase(test.IntTestCase):
+class TypedPyrexGenTestCase(testit.IntTestCase):
def setUp(self):
- self.space = test.objspace('flow')
+ self.space = testit.objspace('flow')
def build_cfunc(self, func):
try: func = func.im_func
except AttributeError: pass
- dot = test.Options.verbose >0 and 1 or 0
+ dot = testit.Options.verbose >0 and 1 or 0
options = {
'simplify' : 1,
'dot' : dot,
@@ -90,7 +90,7 @@
try: func = func.im_func
except AttributeError: pass
- dot = test.Options.verbose >0 and 1 or 0
+ dot = testit.Options.verbose >0 and 1 or 0
options = {
'simplify' : 1,
'dot' : dot,
@@ -98,4 +98,4 @@
return build_cfunc(func, **options)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/translator/test/test_sourcegen.py
==============================================================================
--- pypy/trunk/src/pypy/translator/test/test_sourcegen.py (original)
+++ pypy/trunk/src/pypy/translator/test/test_sourcegen.py Wed Dec 24 00:01:48 2003
@@ -1,6 +1,6 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.tool.udir import udir
from pypy.translator.genpyrex import GenPyrex
@@ -9,7 +9,7 @@
from pypy.translator.tool.buildpyxmodule import make_module_from_pyxstring
#from pypy.translator.test.make_dot import make_ps
-class SourceGenTestCase(test.IntTestCase):
+class SourceGenTestCase(testit.IntTestCase):
def test_simple_func(self):
"""
one test source:
@@ -90,4 +90,4 @@
self.assertEquals(mod.f(-3), 0)
if __name__ == '__main__':
- test.main()
+ testit.main()
Modified: pypy/trunk/src/pypy/translator/tool/benchmark.py
==============================================================================
--- pypy/trunk/src/pypy/translator/tool/benchmark.py (original)
+++ pypy/trunk/src/pypy/translator/tool/benchmark.py Wed Dec 24 00:01:48 2003
@@ -1,5 +1,5 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.tool.udir import udir
from pypy.translator.tool.buildpyxmodule import build_cfunc
from pypy.translator.test.test_cltrans import global_cl, make_cl_func
Modified: pypy/trunk/src/pypy/translator/tool/buildpyxmodule.py
==============================================================================
--- pypy/trunk/src/pypy/translator/tool/buildpyxmodule.py (original)
+++ pypy/trunk/src/pypy/translator/tool/buildpyxmodule.py Wed Dec 24 00:01:48 2003
@@ -1,5 +1,5 @@
import autopath
-from pypy.tool import test
+from pypy.tool import testit
from pypy.tool.udir import udir
from vpath.adapter.process import exec_cmd
Modified: pypy/trunk/src/pypy/translator/translator.py
==============================================================================
--- pypy/trunk/src/pypy/translator/translator.py (original)
+++ pypy/trunk/src/pypy/translator/translator.py Wed Dec 24 00:01:48 2003
@@ -28,7 +28,7 @@
Try dir(test) for list of current snippets.
"""
-import test.autopath
+import testit.autopath
from pypy.objspace.flow.model import *
from pypy.annotation.model import *
More information about the Pypy-commit
mailing list