[pypy-svn] r48125 - pypy/dist/lib-python

fijal at codespeak.net fijal at codespeak.net
Sun Oct 28 11:11:22 CET 2007


Author: fijal
Date: Sun Oct 28 11:11:22 2007
New Revision: 48125

Modified:
   pypy/dist/lib-python/conftest.py
Log:
* use modules even if run with -E
* add test_zlib, test_bz2 and test_zipimport as non-core test suites


Modified: pypy/dist/lib-python/conftest.py
==============================================================================
--- pypy/dist/lib-python/conftest.py	(original)
+++ pypy/dist/lib-python/conftest.py	Sun Oct 28 11:11:22 2007
@@ -198,8 +198,8 @@
         #     but we want a py.test refactoring towards
         #     more autonomy of colitems regarding 
         #     their representations 
-        regrtest = self.parent.regrtest 
-        space = gettestobjspace()
+        regrtest = self.parent.regrtest
+        space = gettestobjspace(usemodules=[])
         res, output = self.call_capture(space, regrtest.run_file, space)
 
         outputpath = regrtest.getoutputpath() 
@@ -229,7 +229,7 @@
         if hasattr(self, 'name2item'): 
             return
         self.name2item = {}
-        space = gettestobjspace() 
+        space = gettestobjspace(usemodules=self.regrtest.usemodules)
         if self.regrtest.dumbtest or self.regrtest.getoutputpath(): 
             self.name2item['output'] = SimpleRunItem('output', self) 
             return 
@@ -408,7 +408,7 @@
     RegrTest('test_bsddb3.py', enabled=False),
     RegrTest('test_bufio.py', enabled=True, dumbtest=1, core=True),
     RegrTest('test_builtin.py', enabled=True, core=True),
-    RegrTest('test_bz2.py', enabled=False),
+    RegrTest('test_bz2.py', usemodules='bz2', enabled=True),
     RegrTest('test_calendar.py', enabled=True),
     RegrTest('test_call.py', enabled=True, core=True),
     RegrTest('test_capi.py', enabled=False, dumbtest=1),
@@ -759,7 +759,7 @@
     RegrTest('test_xpickle.py', enabled=False),
     RegrTest('test_xrange.py', enabled=True, core=True),
     RegrTest('test_zipfile.py', enabled=False, dumbtest=1),
-    RegrTest('test_zipimport.py', enabled=True, usemodules='zlib'),
+    RegrTest('test_zipimport.py', enabled=True, usemodules='zlib zipimport'),
     RegrTest('test_zlib.py', enabled=True, usemodules='zlib'),
 ]
 



More information about the Pypy-commit mailing list