Fix autoload error & Nindot.Tests race condition

Amethyst-szs · Jan 13, 2025 · 3327537 · 3327537
1 parent 20d8461
commit 3327537
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/MoonFlow/addons/git_database/plugin/plugin.gd b/MoonFlow/addons/git_database/plugin/plugin.gd
@@ -11,10 +11,6 @@ var tools: Dictionary = {
 
 func _enter_tree():
 	# Setup export plugin
-	var n := "GitInfoSingletonRegisterUtility"
-	if !ProjectSettings.has_setting("autoload/" + n):
-		add_autoload_singleton(n, "res://addons/git_database/plugin/instance_register.gd")
-
 	add_export_plugin(export_handler)
 
 	# Setup tool menu

diff --git a/Nindot.Tests/PathUtility.cs b/Nindot.Tests/PathUtility.cs
@@ -48,9 +48,16 @@ private class Data
     }
 
     private static Data Instance = null;
+    private static bool IsInvalidInstanceData = false;
 
     private static string GetPath(string key)
     {
+        if (IsInvalidInstanceData)
+        {
+            Assert.Skip("No path provided for test requiring " + key);
+            return null;
+        }
+
         if (Instance == null)
             InstantiateData();
 
@@ -85,9 +92,13 @@ private static void InstantiateData()
         const string path = "../../../GamePaths.json";
         const string template = "../../../Resources/GamePathTemplate.json";
 
+        if (IsInvalidInstanceData)
+            return;
+
         // Attempt to access json
         if (!File.Exists(path))
         {
+            IsInvalidInstanceData = true;
             File.Copy(template, path);
 
             const string errStr = "\n\n - MISSING GAME PATHS - \n\n go to Nindot.Tests/GamePaths.json and add your game paths!";