Fix flaky test failures from card DB load racing a test timeout

forge-core/src/main/java/forge/CardStorageReader.java

@@ -299,7 +299,11 @@ private void executeLoadTask(final Collection<CardRules> result, final List<Call
                     result.addAll(c.call());
                 }
             }
-        } catch (InterruptedException | ExecutionException e) {
+        } catch (InterruptedException e) {
+            // Propagate so callers don't cache a partially-loaded card set as if it were complete.
+            Thread.currentThread().interrupt();
+            throw new RuntimeException(e);
+        } catch (ExecutionException e) {
             e.printStackTrace();
         } catch (final Exception e) { // this clause comes from non-threaded branch
             throw new RuntimeException(e);

forge-gui-desktop/src/test/java/forge/ai/AITest.java

@@ -27,9 +27,26 @@
 import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
 
+import org.testng.annotations.BeforeMethod;
+
 public class AITest {
     private static boolean initialized = false;
 
+    // One-time card DB load must run outside any @Test(timeOut) window, or a timeout interrupt mid-load corrupts the shared StaticData cache.
+    @BeforeMethod
+    public void initializeModel() {
+        if (initialized) {
+            return;
+        }
+        GuiBase.setInterface(new GuiDesktop());
+        FModel.initialize(null, preferences -> {
+            preferences.setPref(FPref.LOAD_CARD_SCRIPTS_LAZILY, false);
+            preferences.setPref(FPref.UI_LANGUAGE, "en-US");
+            return null;
+        });
+        initialized = true;
+    }
+
     public Game resetGame() {
         // need to be done after FModel.initialize, or the Localizer isn't loaded yet
         List<RegisteredPlayer> players = Lists.newArrayList();
@@ -49,16 +66,6 @@ public Game resetGame() {
     }
 
     protected Game initAndCreateGame() {
-        if (!initialized) {
-            GuiBase.setInterface(new GuiDesktop());
-            FModel.initialize(null, preferences -> {
-                preferences.setPref(FPref.LOAD_CARD_SCRIPTS_LAZILY, false);
-                preferences.setPref(FPref.UI_LANGUAGE, "en-US");
-                return null;
-            });
-            initialized = true;
-        }
-
         return resetGame();
     }