tests-extra: make every module import unique

tests-extra/runtests.py

@@ -143,7 +143,6 @@ def job():
     global included_list
 
     ctx = Context()
-    loaded_module_name = None
 
     while True:
         lock.acquire()
@@ -171,7 +170,8 @@ def job():
             log_file = os.path.join(out_dir, "case.log")
 
             os.makedirs(out_dir, exist_ok=True)
-            ctx.module = "%s.%s.%s" % (TESTS_DIR, test, case)
+            ctx.module_name = "%s_%s_%i" % (test, case, repeat)
+            ctx.module_path = os.path.join(os.path.dirname(sys.argv[0]), TESTS_DIR, test, case)
             ctx.test_dir = case_dir
             ctx.out_dir = out_dir
             ctx.case_log = open(log_file, mode="a")
@@ -186,11 +186,10 @@ def job():
             continue
 
         try:
-            loaded_module_name = "%s.%s.%s.test" % (TESTS_DIR, test, case)
-            if loaded_module_name in sys.modules.keys():
-                loaded_module = sys.modules[loaded_module_name]
-            else:
-                loaded_module = importlib.import_module(loaded_module_name)
+            module_entry = os.path.join(ctx.module_path, "test.py")
+            spec = importlib.util.spec_from_file_location(ctx.module_name, module_entry)
+            mod = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(mod)
         except dnstest.utils.Skip as exc:
             log.error(case_str_err + "SKIPPED (%s)" % format(exc))
             skip_cnt += 1

tests-extra/tests/ixfr/from_differences/test.py

@@ -104,9 +104,11 @@ t = dnstest.test.Test()
 
 for dirname in sorted(os.listdir(Context().test_dir)):
     if patern.match(dirname):
-        mod_name = Context().module + "." + dirname + ".step"
-        mod = importlib.import_module(mod_name)
-        storage = Context().test_dir + "/" + dirname
+        mod_name = Context().module_name + "_" + dirname
+        mod_path = os.path.join(Context().module_path, dirname, "step.py")
+        spec = importlib.util.spec_from_file_location(mod_name, mod_path)
+        mod = importlib.util.module_from_spec(spec)
+        storage = os.path.join(Context().test_dir, dirname)
 
         i = IxfrTopology(t, storage)
 
@@ -120,6 +122,7 @@ for dirname in sorted(os.listdir(Context().test_dir)):
                    (i.ref_master.name, i.slave2.name))
         detail_log("####################################")
 
+        spec.loader.exec_module(mod)
         mod.run(i)
         i.clean()