[pypy-svn] rev 733 - in pypy/trunk/src/pypy: . appspace/test interpreter interpreter/test module/test objspace/std objspace/std/test

[mwh at codespeak.net]

Author: mwh
Date: Fri May 30 17:34:59 2003
New Revision: 733

Modified:
   pypy/trunk/src/pypy/appspace/test/testsupport.py
   pypy/trunk/src/pypy/interpreter/test/testsupport.py
   pypy/trunk/src/pypy/interpreter/testsupport.py
   pypy/trunk/src/pypy/module/test/test_filter.py   (props changed)
   pypy/trunk/src/pypy/module/test/test_map.py   (props changed)
   pypy/trunk/src/pypy/module/test/test_reduce.py   (props changed)
   pypy/trunk/src/pypy/module/test/test_vars.py   (props changed)
   pypy/trunk/src/pypy/module/test/test_zip.py   (props changed)
   pypy/trunk/src/pypy/module/test/testsupport.py
   pypy/trunk/src/pypy/objspace/std/booltype.py   (props changed)
   pypy/trunk/src/pypy/objspace/std/dicttype.py   (props changed)
   pypy/trunk/src/pypy/objspace/std/floattype.py   (props changed)
   pypy/trunk/src/pypy/objspace/std/inttype.py   (props changed)
   pypy/trunk/src/pypy/objspace/std/listtype.py   (props changed)
   pypy/trunk/src/pypy/objspace/std/moduletype.py   (props changed)
   pypy/trunk/src/pypy/objspace/std/nonetype.py   (props changed)
   pypy/trunk/src/pypy/objspace/std/stringtype.py   (props changed)
   pypy/trunk/src/pypy/objspace/std/test/test_sliceobject.py   (contents, props changed)
   pypy/trunk/src/pypy/objspace/std/test/testsupport.py
   pypy/trunk/src/pypy/objspace/std/tupletype.py   (props changed)
   pypy/trunk/src/pypy/testsupport.py
Log:
line endings + testsupport tweaks


Modified: pypy/trunk/src/pypy/appspace/test/testsupport.py
==============================================================================
--- pypy/trunk/src/pypy/appspace/test/testsupport.py	(original)
+++ pypy/trunk/src/pypy/appspace/test/testsupport.py	Fri May 30 17:34:59 2003
@@ -45,18 +45,19 @@
 
 from pypy.interpreter import testtools
 
-objspace_path = os.environ.get('OBJSPACE')
-if not objspace_path or '.' not in objspace_path:
-    import pypy.objspace.trivial
-    objspace = pypy.objspace.trivial.TrivialObjSpace
-else:
-    objspace_pieces = objspace_path.split('.')
-    objspace_path = '.'.join(objspace_pieces[:-1])
-    objspace_module = __import__(objspace_path)
-    for piece in objspace_pieces[1:-1]:
-        objspace_module = getattr(objspace_module, piece)
-    objspace_classname = objspace_pieces[-1]
-    objspace = getattr(objspace_module, objspace_classname)
+def objspace():
+    objspace_path = os.environ.get('OBJSPACE')
+    if not objspace_path or '.' not in objspace_path:
+        import pypy.objspace.trivial
+        return pypy.objspace.trivial.TrivialObjSpace()
+    else:
+        objspace_pieces = objspace_path.split('.')
+        objspace_path = '.'.join(objspace_pieces[:-1])
+        objspace_module = __import__(objspace_path)
+        for piece in objspace_pieces[1:-1]:
+            objspace_module = getattr(objspace_module, piece)
+        objspace_classname = objspace_pieces[-1]
+        return getattr(objspace_module, objspace_classname)()
 
 if __name__ == '__main__':
     runner = unittest.TextTestRunner()

Modified: pypy/trunk/src/pypy/interpreter/test/testsupport.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/test/testsupport.py	(original)
+++ pypy/trunk/src/pypy/interpreter/test/testsupport.py	Fri May 30 17:34:59 2003
@@ -45,18 +45,19 @@
 
 from pypy.interpreter import testtools
 
-objspace_path = os.environ.get('OBJSPACE')
-if not objspace_path or '.' not in objspace_path:
-    import pypy.objspace.trivial
-    objspace = pypy.objspace.trivial.TrivialObjSpace
-else:
-    objspace_pieces = objspace_path.split('.')
-    objspace_path = '.'.join(objspace_pieces[:-1])
-    objspace_module = __import__(objspace_path)
-    for piece in objspace_pieces[1:-1]:
-        objspace_module = getattr(objspace_module, piece)
-    objspace_classname = objspace_pieces[-1]
-    objspace = getattr(objspace_module, objspace_classname)
+def objspace():
+    objspace_path = os.environ.get('OBJSPACE')
+    if not objspace_path or '.' not in objspace_path:
+        import pypy.objspace.trivial
+        return pypy.objspace.trivial.TrivialObjSpace()
+    else:
+        objspace_pieces = objspace_path.split('.')
+        objspace_path = '.'.join(objspace_pieces[:-1])
+        objspace_module = __import__(objspace_path)
+        for piece in objspace_pieces[1:-1]:
+            objspace_module = getattr(objspace_module, piece)
+        objspace_classname = objspace_pieces[-1]
+        return getattr(objspace_module, objspace_classname)()
 
 if __name__ == '__main__':
     runner = unittest.TextTestRunner()

Modified: pypy/trunk/src/pypy/interpreter/testsupport.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/testsupport.py	(original)
+++ pypy/trunk/src/pypy/interpreter/testsupport.py	Fri May 30 17:34:59 2003
@@ -1,63 +1,64 @@
-"""
-Master version of testsupport.py: copy into any subdirectory of pypy
-from which scripts need to be run (typically all of the 'test' subdirs)
-so that any test can "import testsupport" to ensure the parent of pypy
-is on the sys.path -- so that "import pypy.etc.etc." always works.
-
-Also, this module exposes a member 'TestCase' that is unittest.TestCase
-or a subclass thereof supplying extra methods; and a function 'main'
-that is unittest.main or the equivalent.
-
-Furthermore, this module now exposes a member 'objspace' which is
-by default class pypy.objspace.trivial.TrivialObjSpace but can be
-set to use another objectspace instead; this allows tests to run
-under different objectspaces without needing to edit their sources.
-
-For this setting, use environment variable OBJSPACE and set it to
-a value such as 'pypy.objspace.trivial.TrivialObjSpace' (which is
-also the default if the environment variable is not found or empty
-or without any dot in it).
-
-When run as a script, runs all tests found in files called 'test_*.py'
-in the same directory.
-"""
-import sys, os
-
-try:
-    head = this_path = os.path.abspath(__file__)
-except NameError:
-    p = os.path.dirname(sys.argv[0])
-    if not p:
-        p = os.curdir
-    head = this_path = os.path.abspath(p)
-while 1:
-    head, tail = os.path.split(head)
-    if not tail:
-        raise EnvironmentError, "pypy not among parents of %r!" % this_path
-    elif tail.lower()=='pypy':
-        sys.path.insert(0, head)
-        break
-
-import pypy.interpreter.unittest_w
-TestCase = pypy.interpreter.unittest_w.TestCase_w
-import unittest
-main = unittest.main
-
-from pypy.interpreter import testtools
-
-objspace_path = os.environ.get('OBJSPACE')
-if not objspace_path or '.' not in objspace_path:
-    import pypy.objspace.trivial
-    objspace = pypy.objspace.trivial.TrivialObjSpace
-else:
-    objspace_pieces = objspace_path.split('.')
-    objspace_path = '.'.join(objspace_pieces[:-1])
-    objspace_module = __import__(objspace_path)
-    for piece in objspace_pieces[1:-1]:
-        objspace_module = getattr(objspace_module, piece)
-    objspace_classname = objspace_pieces[-1]
-    objspace = getattr(objspace_module, objspace_classname)
-
-if __name__ == '__main__':
-    runner = unittest.TextTestRunner()
-    runner.run(testtools.get_tests_for_dir(os.path.dirname(sys.argv[0])))
+"""
+Master version of testsupport.py: copy into any subdirectory of pypy
+from which scripts need to be run (typically all of the 'test' subdirs)
+so that any test can "import testsupport" to ensure the parent of pypy
+is on the sys.path -- so that "import pypy.etc.etc." always works.
+
+Also, this module exposes a member 'TestCase' that is unittest.TestCase
+or a subclass thereof supplying extra methods; and a function 'main'
+that is unittest.main or the equivalent.
+
+Furthermore, this module now exposes a member 'objspace' which is
+by default class pypy.objspace.trivial.TrivialObjSpace but can be
+set to use another objectspace instead; this allows tests to run
+under different objectspaces without needing to edit their sources.
+
+For this setting, use environment variable OBJSPACE and set it to
+a value such as 'pypy.objspace.trivial.TrivialObjSpace' (which is
+also the default if the environment variable is not found or empty
+or without any dot in it).
+
+When run as a script, runs all tests found in files called 'test_*.py'
+in the same directory.
+"""
+import sys, os
+
+try:
+    head = this_path = os.path.abspath(__file__)
+except NameError:
+    p = os.path.dirname(sys.argv[0])
+    if not p:
+        p = os.curdir
+    head = this_path = os.path.abspath(p)
+while 1:
+    head, tail = os.path.split(head)
+    if not tail:
+        raise EnvironmentError, "pypy not among parents of %r!" % this_path
+    elif tail.lower()=='pypy':
+        sys.path.insert(0, head)
+        break
+
+import pypy.interpreter.unittest_w
+TestCase = pypy.interpreter.unittest_w.TestCase_w
+import unittest
+main = unittest.main
+
+from pypy.interpreter import testtools
+
+def objspace():
+    objspace_path = os.environ.get('OBJSPACE')
+    if not objspace_path or '.' not in objspace_path:
+        import pypy.objspace.trivial
+        return pypy.objspace.trivial.TrivialObjSpace()
+    else:
+        objspace_pieces = objspace_path.split('.')
+        objspace_path = '.'.join(objspace_pieces[:-1])
+        objspace_module = __import__(objspace_path)
+        for piece in objspace_pieces[1:-1]:
+            objspace_module = getattr(objspace_module, piece)
+        objspace_classname = objspace_pieces[-1]
+        return getattr(objspace_module, objspace_classname)()
+
+if __name__ == '__main__':
+    runner = unittest.TextTestRunner()
+    runner.run(testtools.get_tests_for_dir(os.path.dirname(sys.argv[0])))

Modified: pypy/trunk/src/pypy/module/test/testsupport.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/testsupport.py	(original)
+++ pypy/trunk/src/pypy/module/test/testsupport.py	Fri May 30 17:34:59 2003
@@ -45,18 +45,19 @@
 
 from pypy.interpreter import testtools
 
-objspace_path = os.environ.get('OBJSPACE')
-if not objspace_path or '.' not in objspace_path:
-    import pypy.objspace.trivial
-    objspace = pypy.objspace.trivial.TrivialObjSpace
-else:
-    objspace_pieces = objspace_path.split('.')
-    objspace_path = '.'.join(objspace_pieces[:-1])
-    objspace_module = __import__(objspace_path)
-    for piece in objspace_pieces[1:-1]:
-        objspace_module = getattr(objspace_module, piece)
-    objspace_classname = objspace_pieces[-1]
-    objspace = getattr(objspace_module, objspace_classname)
+def objspace():
+    objspace_path = os.environ.get('OBJSPACE')
+    if not objspace_path or '.' not in objspace_path:
+        import pypy.objspace.trivial
+        return pypy.objspace.trivial.TrivialObjSpace()
+    else:
+        objspace_pieces = objspace_path.split('.')
+        objspace_path = '.'.join(objspace_pieces[:-1])
+        objspace_module = __import__(objspace_path)
+        for piece in objspace_pieces[1:-1]:
+            objspace_module = getattr(objspace_module, piece)
+        objspace_classname = objspace_pieces[-1]
+        return getattr(objspace_module, objspace_classname)()
 
 if __name__ == '__main__':
     runner = unittest.TextTestRunner()

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	Fri May 30 17:34:59 2003
@@ -1,4 +1,5 @@
 import testsupport
+from pypy.objspace.std import StdObjSpace
 
 class TestW_SliceObject(testsupport.TestCase):
 

Modified: pypy/trunk/src/pypy/objspace/std/test/testsupport.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/testsupport.py	(original)
+++ pypy/trunk/src/pypy/objspace/std/test/testsupport.py	Fri May 30 17:34:59 2003
@@ -45,18 +45,19 @@
 
 from pypy.interpreter import testtools
 
-objspace_path = os.environ.get('OBJSPACE')
-if not objspace_path or '.' not in objspace_path:
-    import pypy.objspace.trivial
-    objspace = pypy.objspace.trivial.TrivialObjSpace
-else:
-    objspace_pieces = objspace_path.split('.')
-    objspace_path = '.'.join(objspace_pieces[:-1])
-    objspace_module = __import__(objspace_path)
-    for piece in objspace_pieces[1:-1]:
-        objspace_module = getattr(objspace_module, piece)
-    objspace_classname = objspace_pieces[-1]
-    objspace = getattr(objspace_module, objspace_classname)
+def objspace():
+    objspace_path = os.environ.get('OBJSPACE')
+    if not objspace_path or '.' not in objspace_path:
+        import pypy.objspace.trivial
+        return pypy.objspace.trivial.TrivialObjSpace()
+    else:
+        objspace_pieces = objspace_path.split('.')
+        objspace_path = '.'.join(objspace_pieces[:-1])
+        objspace_module = __import__(objspace_path)
+        for piece in objspace_pieces[1:-1]:
+            objspace_module = getattr(objspace_module, piece)
+        objspace_classname = objspace_pieces[-1]
+        return getattr(objspace_module, objspace_classname)()
 
 if __name__ == '__main__':
     runner = unittest.TextTestRunner()

Modified: pypy/trunk/src/pypy/testsupport.py
==============================================================================
--- pypy/trunk/src/pypy/testsupport.py	(original)
+++ pypy/trunk/src/pypy/testsupport.py	Fri May 30 17:34:59 2003
@@ -45,18 +45,19 @@
 
 from pypy.interpreter import testtools
 
-objspace_path = os.environ.get('OBJSPACE')
-if not objspace_path or '.' not in objspace_path:
-    import pypy.objspace.trivial
-    objspace = pypy.objspace.trivial.TrivialObjSpace
-else:
-    objspace_pieces = objspace_path.split('.')
-    objspace_path = '.'.join(objspace_pieces[:-1])
-    objspace_module = __import__(objspace_path)
-    for piece in objspace_pieces[1:-1]:
-        objspace_module = getattr(objspace_module, piece)
-    objspace_classname = objspace_pieces[-1]
-    objspace = getattr(objspace_module, objspace_classname)
+def objspace():
+    objspace_path = os.environ.get('OBJSPACE')
+    if not objspace_path or '.' not in objspace_path:
+        import pypy.objspace.trivial
+        return pypy.objspace.trivial.TrivialObjSpace()
+    else:
+        objspace_pieces = objspace_path.split('.')
+        objspace_path = '.'.join(objspace_pieces[:-1])
+        objspace_module = __import__(objspace_path)
+        for piece in objspace_pieces[1:-1]:
+            objspace_module = getattr(objspace_module, piece)
+        objspace_classname = objspace_pieces[-1]
+        return getattr(objspace_module, objspace_classname)()
 
 if __name__ == '__main__':
     runner = unittest.TextTestRunner()