wip

Author: Debilski

test/test_pelita_player.py

@@ -30,6 +30,10 @@ def move(bot, state):
 # NB: The modules must be unloaded after use
 # If we import modules with the same name again, the results will be very unexpected
 
+class AutoCleanModules:
+    def __init__(self, modules):
+        self.modules = modules
+
 @pytest.fixture
 def cleanup_test_modules(request):
 
@@ -47,12 +51,11 @@ def cleanup_test_modules(request):
         if module in sys.modules:
             raise RuntimeError(f"Test module {module} is already in sys.modules.")
 
-    res = yield
+    auto_clean_modules = AutoCleanModules(modules)
 
-    if res == "NOT_LOADED":
-        return
+    yield auto_clean_modules
 
-    for module in modules:
+    for module in auto_clean_modules.modules:
         del sys.modules[module]
 
 @pytest.mark.cleanup_test_modules(["teamx"])
@@ -150,7 +153,8 @@ def test_player_import_name(name, expected, cleanup_test_modules):
                 if _mswindows:
                     # Ignore UnicodeEncodeErrors on Windows for this test
                     # It is too complicate to debug this
-                    return "NOT_LOADED"
+                    cleanup_test_modules.modules = []
+                    return
                 else:
                     raise