[pypy-commit] pypy reflex-support: consistent usemodules to prevent cpyext initialization ordering issues

[wlav]

Author: Wim Lavrijsen <WLavrijsen at lbl.gov>
Branch: reflex-support
Changeset: r65968:15ed4866c0da
Date: 2013-08-06 04:40 -0700
http://bitbucket.org/pypy/pypy/changeset/15ed4866c0da/

Log:	consistent usemodules to prevent cpyext initialization ordering
	issues

diff --git a/pypy/module/cppyy/test/test_aclassloader.py b/pypy/module/cppyy/test/test_aclassloader.py
--- a/pypy/module/cppyy/test/test_aclassloader.py
+++ b/pypy/module/cppyy/test/test_aclassloader.py
@@ -12,7 +12,7 @@
 
 
 class AppTestACLASSLOADER:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.space.appexec([], """():
diff --git a/pypy/module/cppyy/test/test_advancedcpp.py b/pypy/module/cppyy/test/test_advancedcpp.py
--- a/pypy/module/cppyy/test/test_advancedcpp.py
+++ b/pypy/module/cppyy/test/test_advancedcpp.py
@@ -15,7 +15,7 @@
             raise OSError("'make' failed (see stderr)")
 
 class AppTestADVANCEDCPP:
-    spaceconfig = dict(usemodules=['cppyy', 'array'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_test_dct = cls.space.wrap(test_dct)
diff --git a/pypy/module/cppyy/test/test_cint.py b/pypy/module/cppyy/test/test_cint.py
--- a/pypy/module/cppyy/test/test_cint.py
+++ b/pypy/module/cppyy/test/test_cint.py
@@ -18,7 +18,7 @@
         raise OSError("'make' failed (see stderr)")
 
 class AppTestCINT:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def test01_globals(self):
         """Test the availability of ROOT globals"""
@@ -96,7 +96,7 @@
 
 
 class AppTestCINTPYTHONIZATIONS:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def test01_strings(self):
         """Test TString/TObjString compatibility"""
@@ -139,7 +139,7 @@
 
 
 class AppTestCINTTTREE:
-    spaceconfig = dict(usemodules=['cppyy', 'array', '_rawffi', '_cffi_backend'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools', '_cffi_backend'])
 
     def setup_class(cls):
         cls.w_N = cls.space.wrap(5)
@@ -385,7 +385,7 @@
 
 
 class AppTestCINTREGRESSION:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     # these are tests that at some point in the past resulted in failures on
     # PyROOT; kept here to confirm no regression from PyROOT
@@ -405,7 +405,7 @@
 
 
 class AppTestSURPLUS:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     # these are tests that were historically exercised on ROOT classes and
     # have twins on custom classes; kept here just in case differences crop
diff --git a/pypy/module/cppyy/test/test_cppyy.py b/pypy/module/cppyy/test/test_cppyy.py
--- a/pypy/module/cppyy/test/test_cppyy.py
+++ b/pypy/module/cppyy/test/test_cppyy.py
@@ -28,7 +28,7 @@
 
 
 class AppTestCPPYY:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_example01, cls.w_payload = cls.space.unpackiterable(cls.space.appexec([], """():
diff --git a/pypy/module/cppyy/test/test_crossing.py b/pypy/module/cppyy/test/test_crossing.py
--- a/pypy/module/cppyy/test/test_crossing.py
+++ b/pypy/module/cppyy/test/test_crossing.py
@@ -65,8 +65,9 @@
     return str(pydname)
 
 class AppTestCrossing(AppTestCpythonExtensionBase):
-    spaceconfig = dict(usemodules=['cpyext', 'cppyy', 'thread', '_rawffi', '_ffi',
-                                   'array', 'itertools', 'rctime', 'binascii'])
+    #spaceconfig = dict(usemodules=['cpyext', 'thread', '_rawffi',
+    #                               'array', 'rctime', 'binascii', 'itertools', '_ffi', 'cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools', 'cpyext'])
 
     def setup_class(cls):
         AppTestCpythonExtensionBase.setup_class.im_func(cls)
@@ -74,7 +75,7 @@
         # to allow the generated extension module be loaded first)
         cls.w_test_dct    = cls.space.wrap(test_dct)
         cls.w_pre_imports = cls.space.appexec([], """():
-            import cppyy, ctypes""")    # prevents leak-checking complaints on ctypes
+            import cppyy, cpyext, ctypes""")    # prevents leak-checking complaints on ctypes
 
     def setup_method(self, func):
         AppTestCpythonExtensionBase.setup_method.im_func(self, func)
diff --git a/pypy/module/cppyy/test/test_datatypes.py b/pypy/module/cppyy/test/test_datatypes.py
--- a/pypy/module/cppyy/test/test_datatypes.py
+++ b/pypy/module/cppyy/test/test_datatypes.py
@@ -12,7 +12,7 @@
         raise OSError("'make' failed (see stderr)")
 
 class AppTestDATATYPES:
-    spaceconfig = dict(usemodules=['cppyy', 'array', '_rawffi'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_N = cls.space.wrap(5)  # should be imported from the dictionary
diff --git a/pypy/module/cppyy/test/test_fragile.py b/pypy/module/cppyy/test/test_fragile.py
--- a/pypy/module/cppyy/test/test_fragile.py
+++ b/pypy/module/cppyy/test/test_fragile.py
@@ -12,7 +12,7 @@
         raise OSError("'make' failed (see stderr)")
 
 class AppTestFRAGILE:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_test_dct  = cls.space.wrap(test_dct)
diff --git a/pypy/module/cppyy/test/test_operators.py b/pypy/module/cppyy/test/test_operators.py
--- a/pypy/module/cppyy/test/test_operators.py
+++ b/pypy/module/cppyy/test/test_operators.py
@@ -12,7 +12,7 @@
         raise OSError("'make' failed (see stderr)")
 
 class AppTestOPERATORS:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_N = cls.space.wrap(5)  # should be imported from the dictionary
diff --git a/pypy/module/cppyy/test/test_overloads.py b/pypy/module/cppyy/test/test_overloads.py
--- a/pypy/module/cppyy/test/test_overloads.py
+++ b/pypy/module/cppyy/test/test_overloads.py
@@ -12,7 +12,7 @@
         raise OSError("'make' failed (see stderr)")
 
 class AppTestOVERLOADS:
-    spaceconfig = dict(usemodules=['cppyy', 'array'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         env = os.environ
diff --git a/pypy/module/cppyy/test/test_pythonify.py b/pypy/module/cppyy/test/test_pythonify.py
--- a/pypy/module/cppyy/test/test_pythonify.py
+++ b/pypy/module/cppyy/test/test_pythonify.py
@@ -16,7 +16,7 @@
         raise OSError("'make' failed (see stderr)")
 
 class AppTestPYTHONIFY:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_test_dct  = cls.space.wrap(test_dct)
@@ -325,7 +325,7 @@
 
 
 class AppTestPYTHONIFY_UI:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_test_dct  = cls.space.wrap(test_dct)
diff --git a/pypy/module/cppyy/test/test_stltypes.py b/pypy/module/cppyy/test/test_stltypes.py
--- a/pypy/module/cppyy/test/test_stltypes.py
+++ b/pypy/module/cppyy/test/test_stltypes.py
@@ -12,7 +12,7 @@
         raise OSError("'make' failed (see stderr)")
 
 class AppTestSTLVECTOR:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_N = cls.space.wrap(13)
@@ -200,7 +200,7 @@
 
 
 class AppTestSTLSTRING:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_test_dct  = cls.space.wrap(test_dct)
@@ -280,7 +280,7 @@
 
 
 class AppTestSTLLIST:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_N = cls.space.wrap(13)
@@ -336,13 +336,13 @@
 
 
 class AppTestSTLMAP:
-    spaceconfig = dict(usemodules=['cppyy', 'itertools'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_N = cls.space.wrap(13)
         cls.w_test_dct  = cls.space.wrap(test_dct)
         cls.w_stlstring = cls.space.appexec([], """():
-            import cppyy, math, sys
+            import cppyy
             return cppyy.load_reflection_info(%r)""" % (test_dct, ))
 
     def test01_builtin_map_type(self):
@@ -445,7 +445,7 @@
 
 
 class AppTestSTLITERATOR:
-    spaceconfig = dict(usemodules=['cppyy', 'itertools'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_test_dct  = cls.space.wrap(test_dct)
diff --git a/pypy/module/cppyy/test/test_streams.py b/pypy/module/cppyy/test/test_streams.py
--- a/pypy/module/cppyy/test/test_streams.py
+++ b/pypy/module/cppyy/test/test_streams.py
@@ -12,7 +12,7 @@
         raise OSError("'make' failed (see stderr)")
 
 class AppTestSTDStreams:
-    spaceconfig = dict(usemodules=['cppyy'])
+    spaceconfig = dict(usemodules=['cppyy', '_rawffi', '_ffi', 'itertools'])
 
     def setup_class(cls):
         cls.w_test_dct  = cls.space.wrap(test_dct)