From d7f6c84cb2e138a9002d36ba26ea09536cf52623 Mon Sep 17 00:00:00 2001
From: Michael FIG <mfig@agoric.com>
Date: Thu, 6 Jun 2024 12:32:19 -0600
Subject: [PATCH] test(boot): use separate bundle caches to prevent concurrent
 flakes

---
 .../boot/test/bootstrapTests/net-ibc-upgrade.test.ts   |  2 +-
 packages/boot/test/bootstrapTests/vats-restart.test.ts | 10 +++++++---
 .../test/bootstrapTests/vaults-integration.test.ts     |  5 ++++-
 .../boot/test/bootstrapTests/vaults-upgrade.test.ts    | 10 +++++++---
 packages/boot/test/bootstrapTests/walletFactory.ts     | 10 +++++++---
 packages/boot/test/bootstrapTests/zcf-upgrade.test.ts  | 10 +++++++---
 6 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/packages/boot/test/bootstrapTests/net-ibc-upgrade.test.ts b/packages/boot/test/bootstrapTests/net-ibc-upgrade.test.ts
index 47dcc7d963c9..c44552cac7a5 100644
--- a/packages/boot/test/bootstrapTests/net-ibc-upgrade.test.ts
+++ b/packages/boot/test/bootstrapTests/net-ibc-upgrade.test.ts
@@ -31,7 +31,7 @@ export const makeTestContext = async t => {
   }) as Baggage;
   const zone = makeDurableZone(baggage);
 
-  const bundleDir = 'bundles/vaults';
+  const bundleDir = 'bundles/net-ibc-upgrade';
   const bundleCache = await makeNodeBundleCache(
     bundleDir,
     { cacheSourceMaps: false },
diff --git a/packages/boot/test/bootstrapTests/vats-restart.test.ts b/packages/boot/test/bootstrapTests/vats-restart.test.ts
index fd3c35ef96f2..c34d66a5724e 100644
--- a/packages/boot/test/bootstrapTests/vats-restart.test.ts
+++ b/packages/boot/test/bootstrapTests/vats-restart.test.ts
@@ -23,9 +23,13 @@ const PLATFORM_CONFIG = '@agoric/vm-config/decentral-itest-vaults-config.json';
 
 export const makeTestContext = async t => {
   console.time('DefaultTestContext');
-  const swingsetTestKit = await makeSwingsetTestKit(t.log, 'bundles/vaults', {
-    configSpecifier: PLATFORM_CONFIG,
-  });
+  const swingsetTestKit = await makeSwingsetTestKit(
+    t.log,
+    'bundles/vats-restart',
+    {
+      configSpecifier: PLATFORM_CONFIG,
+    },
+  );
 
   const { runUtils, storage } = swingsetTestKit;
   console.timeLog('DefaultTestContext', 'swingsetTestKit');
diff --git a/packages/boot/test/bootstrapTests/vaults-integration.test.ts b/packages/boot/test/bootstrapTests/vaults-integration.test.ts
index 9d66c9a6f3b3..b6f24417e36f 100644
--- a/packages/boot/test/bootstrapTests/vaults-integration.test.ts
+++ b/packages/boot/test/bootstrapTests/vaults-integration.test.ts
@@ -31,7 +31,10 @@ const likePayouts = (collateral, minted) => ({
 
 const makeDefaultTestContext = async t => {
   console.time('DefaultTestContext');
-  const swingsetTestKit = await makeSwingsetTestKit(t.log, 'bundles/vaults');
+  const swingsetTestKit = await makeSwingsetTestKit(
+    t.log,
+    'bundles/vaults-integration',
+  );
 
   const { runUtils, storage } = swingsetTestKit;
   console.timeLog('DefaultTestContext', 'swingsetTestKit');
diff --git a/packages/boot/test/bootstrapTests/vaults-upgrade.test.ts b/packages/boot/test/bootstrapTests/vaults-upgrade.test.ts
index cb7cf1233b76..1013619428c9 100644
--- a/packages/boot/test/bootstrapTests/vaults-upgrade.test.ts
+++ b/packages/boot/test/bootstrapTests/vaults-upgrade.test.ts
@@ -30,9 +30,13 @@ const makeDefaultTestContext = async (
   } = {},
 ) => {
   logTiming && console.time('DefaultTestContext');
-  const swingsetTestKit = await makeSwingsetTestKit(t.log, 'bundles/vaults', {
-    storage,
-  });
+  const swingsetTestKit = await makeSwingsetTestKit(
+    t.log,
+    'bundles/vaults-upgrade',
+    {
+      storage,
+    },
+  );
 
   const { readLatest, runUtils } = swingsetTestKit;
   ({ storage } = swingsetTestKit);
diff --git a/packages/boot/test/bootstrapTests/walletFactory.ts b/packages/boot/test/bootstrapTests/walletFactory.ts
index 515cb75df3bc..2f844ec8de7e 100644
--- a/packages/boot/test/bootstrapTests/walletFactory.ts
+++ b/packages/boot/test/bootstrapTests/walletFactory.ts
@@ -8,9 +8,13 @@ import { makeWalletFactoryDriver } from '../../tools/drivers.ts';
 const { Fail } = assert;
 
 export const makeWalletFactoryContext = async t => {
-  const swingsetTestKit = await makeSwingsetTestKit(t.log, 'bundles/vaults', {
-    configSpecifier: '@agoric/vm-config/decentral-main-vaults-config.json',
-  });
+  const swingsetTestKit = await makeSwingsetTestKit(
+    t.log,
+    'bundles/walletFactory',
+    {
+      configSpecifier: '@agoric/vm-config/decentral-main-vaults-config.json',
+    },
+  );
 
   const { runUtils, storage } = swingsetTestKit;
   console.timeLog('DefaultTestContext', 'swingsetTestKit');
diff --git a/packages/boot/test/bootstrapTests/zcf-upgrade.test.ts b/packages/boot/test/bootstrapTests/zcf-upgrade.test.ts
index 4fcda87ffbf3..949957330aa8 100644
--- a/packages/boot/test/bootstrapTests/zcf-upgrade.test.ts
+++ b/packages/boot/test/bootstrapTests/zcf-upgrade.test.ts
@@ -35,9 +35,13 @@ const ZCF_PROBE_SRC = './zcfProbe.js';
 
 export const makeZoeTestContext = async t => {
   console.time('ZoeTestContext');
-  const swingsetTestKit = await makeSwingsetTestKit(t.log, 'bundles/zoe', {
-    configSpecifier: '@agoric/vm-config/decentral-demo-config.json',
-  });
+  const swingsetTestKit = await makeSwingsetTestKit(
+    t.log,
+    'bundles/zcf-upgrade',
+    {
+      configSpecifier: '@agoric/vm-config/decentral-demo-config.json',
+    },
+  );
 
   const { runUtils } = swingsetTestKit;
   console.timeLog('DefaultTestContext', 'swingsetTestKit');