rename possibly identical modules to prevent test collisions

testing/cffi0/test_verify.py

@@ -1,6 +1,6 @@
 import re
 import pytest
-import sys, os, math, weakref
+import sys, os, math, weakref, random
 from cffi import FFI, VerificationError, VerificationMissing, model, FFIError
 from testing.support import *
 from testing.support import extra_compile_args, is_musl
@@ -18,9 +18,19 @@
  if distutils.ccompiler.get_default_compiler() == 'msvc':
  lib_m = ['msvcrt']
  pass # no obvious -Werror equivalent on MSVC
+ class FFI(FFI):
+ def verify(self, *args, **kwds):
+ modulename = kwds.get("modulename", "_cffi_test%d_%d" % (
+ random.randint(0,1000000000), random.randint(0,1000000000)))
+ kwds["modulename"] = modulename
+ return super(FFI, self).verify(*args, **kwds)
+
 else:
  class FFI(FFI):
  def verify(self, *args, **kwds):
+ modulename = kwds.get("modulename", "_cffi_test%d_%d" % (
+ random.randint(0,1000000000), random.randint(0,1000000000)))
+ kwds["modulename"] = modulename
  return super(FFI, self).verify(
  *args, extra_compile_args=extra_compile_args, **kwds)
 
@@ -2164,21 +2174,23 @@ def test_verify_dlopen_flags():
  ffi1 = FFI()
  ffi1.cdef("extern int foo_verify_dlopen_flags;")
 
+ modulename = "_cffi_test_verify_dlopen_flags_%d" % random.randint(0, 1000000000)
  lib1 = ffi1.verify("int foo_verify_dlopen_flags;",
- flags=ffi1.RTLD_GLOBAL | ffi1.RTLD_LAZY)
- lib2 = get_second_lib()
+ flags=ffi1.RTLD_GLOBAL | ffi1.RTLD_LAZY,
+ modulename=modulename)
+ lib2 = get_second_lib(modulename)
 
  lib1.foo_verify_dlopen_flags = 42
  assert lib2.foo_verify_dlopen_flags == 42
  lib2.foo_verify_dlopen_flags += 1
  assert lib1.foo_verify_dlopen_flags == 43
 
-def get_second_lib():
- # Hack, using modulename makes the test fail
+def get_second_lib(modulename):
  ffi2 = FFI()
  ffi2.cdef("extern int foo_verify_dlopen_flags;")
  lib2 = ffi2.verify("int foo_verify_dlopen_flags;",
- flags=ffi2.RTLD_GLOBAL | ffi2.RTLD_LAZY)
+ flags=ffi2.RTLD_GLOBAL | ffi2.RTLD_LAZY,
+ modulename=modulename)
  return lib2
 
 def test_consider_not_implemented_function_type():
@@ -2246,7 +2258,7 @@ def test_implicit_unicode_on_windows():
 
 def test_use_local_dir():
  ffi = FFI()
- lib = ffi.verify("", modulename="test_use_local_dir")
+ lib = ffi.verify("", modulename="_cffi_test_use_local_dir")
  this_dir = os.path.dirname(__file__)
  pycache_files = os.listdir(os.path.join(this_dir, '__pycache__'))
  assert any('test_use_local_dir' in s for s in pycache_files)

testing/cffi0/test_vgen2.py

@@ -3,7 +3,8 @@
 
 # This test file runs normally after test_vgen. We only clean up the .c
 # sources, to check that it also works when we have only the .so. The
-# tests should run much faster than test_vgen.
+# tests used to run much faster than test_vgen, but since we randomize
+# the module names, it needs to recompile everything.
 
 def setup_module():
  cffi.verifier.cleanup_tmpdir(keep_so=True)