Merge pull request #5710 from Agoric/mhofman/5447-fix-controller-shut…

…down-leak

fix: shutdown controller after tests

packages/ERTP/test/swingsetTests/basicFunctionality/test-basicFunctionality.js

@@ -11,7 +11,9 @@ async function main(basedir, argv) {
   config.defaultManagerType = 'xs-worker';
   const controller = await buildVatController(config, argv);
   await controller.run();
-  return controller.dump();
+  const res = controller.dump();
+  await controller.shutdown();
+  return res;
 }
 
 const expected = [

packages/ERTP/test/swingsetTests/splitPayments/test-splitPayments.js

@@ -11,7 +11,9 @@ async function main(basedir, argv) {
   config.defaultManagerType = 'xs-worker';
   const controller = await buildVatController(config, argv);
   await controller.run();
-  return controller.dump();
+  const res = controller.dump();
+  await controller.shutdown();
+  return res;
 }
 
 const expectedTapFaucetLog = [

packages/SwingSet/test/bundling/test-bundles-controller.js

@@ -9,6 +9,7 @@ test('install bundle', async t => {
   const config = {};
   const controller = await buildVatController(config);
   await controller.run();
+  t.teardown(controller.shutdown);
 
   const bundleFile = new URL('./bootstrap-bundles.js', import.meta.url)
     .pathname;
@@ -26,6 +27,7 @@ test('install bundle', async t => {
 test('install bundle without ID', async t => {
   const config = {};
   const controller = await buildVatController(config);
+  t.teardown(controller.shutdown);
   await controller.run();
 
   const bundleFile = new URL('./bootstrap-bundles.js', import.meta.url)
@@ -40,6 +42,7 @@ test('install bundle without ID', async t => {
 test('install invalid bundle fails', async t => {
   const config = {};
   const controller = await buildVatController(config);
+  t.teardown(controller.shutdown);
   await controller.run();
 
   const bundleFile = new URL('./bootstrap-bundles.js', import.meta.url)
@@ -59,6 +62,7 @@ test('install invalid bundle fails', async t => {
 test('install corrupt bundle fails', async t => {
   const config = {};
   const controller = await buildVatController(config);
+  t.teardown(controller.shutdown);
   await controller.run();
 
   const bundleFile = new URL('./bootstrap-bundles.js', import.meta.url)

packages/SwingSet/test/bundling/test-bundles.js

@@ -86,6 +86,7 @@ test('bundles', async t => {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage);
   const c = await makeSwingsetController(hostStorage);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   await c.run();
 

packages/SwingSet/test/change-parameters/test-change-parameters.js

@@ -39,6 +39,7 @@ async function testChangeParameters(t) {
   const { kvStore } = hostStorage;
   await initializeSwingset(config, [], hostStorage);
   const c = await makeSwingsetController(hostStorage, null);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   await c.run();
   t.is(kvStore.get('kernel.defaultReapInterval'), '1');

packages/SwingSet/test/definition/test-vat-definition.js

@@ -24,6 +24,7 @@ test('create with setup and buildRootObject', async t => {
     },
   };
   const c = await buildVatController(config, []);
+  t.teardown(c.shutdown);
   c.pinVatRoot('setup');
   c.pinVatRoot('liveslots');
   let r = c.queueToVatRoot('setup', 'increment', [], 'panic');

packages/SwingSet/test/device-hooks/test-device-hooks.js

@@ -63,6 +63,7 @@ test('add hook', async t => {
   const runtimeOpts = { kernelBundle };
   await initializeSwingset(config, [], hostStorage, initOpts);
   const c = await makeSwingsetController(hostStorage, {}, runtimeOpts);
+  t.teardown(c.shutdown);
 
   let hookreturn;
   function setHookReturn(args, slots = []) {

packages/SwingSet/test/device-mailbox/test-device-mailbox.js

@@ -46,6 +46,7 @@ test('mailbox outbound', async t => {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, ['mailbox1'], hostStorage, initOpts);
   const c = await makeSwingsetController(hostStorage, devEndows, runtimeOpts);
+  t.teardown(c.shutdown);
   await c.run();
   // exportToData() provides plain Numbers to the host that needs to convey the messages
   t.deepEqual(s.exportToData(), {
@@ -95,6 +96,7 @@ test('mailbox inbound', async t => {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, ['mailbox2'], hostStorage, initOpts);
   const c = await makeSwingsetController(hostStorage, devEndows, runtimeOpts);
+  t.teardown(c.shutdown);
   await c.run();
   const m1 = [1, 'msg1'];
   const m2 = [2, 'msg2'];
@@ -165,6 +167,7 @@ async function makeMailboxKernel(t, hostStorage) {
   };
   const { runtimeOpts } = bundleOpts(t.context.data);
   const c = await makeSwingsetController(hostStorage, devEndows, runtimeOpts);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   await c.run();
   return [c, mb];

packages/SwingSet/test/device-plugin/test-device.js

@@ -62,6 +62,7 @@ async function setupVatController(t) {
     t.context.hostStorage,
     deviceEndowments,
   );
+  t.teardown(c.shutdown);
   const cycle = async () => {
     await c.run();
     while (inputQueue.length) {

packages/SwingSet/test/devices/test-devices.js

@@ -66,6 +66,7 @@ test.serial('d0', async t => {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage, initOpts);
   const c = await makeSwingsetController(hostStorage, {}, runtimeOpts);
+  t.teardown(c.shutdown);
   await c.run();
 
   // console.log(util.inspect(c.dump(), { depth: null }));
@@ -120,6 +121,7 @@ test.serial('d1', async t => {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage, initOpts);
   const c = await makeSwingsetController(hostStorage, devEndows, runtimeOpts);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   await c.run();
 
@@ -156,6 +158,7 @@ async function test2(t, mode) {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage, initOpts);
   const c = await makeSwingsetController(hostStorage, {}, runtimeOpts);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   await c.run(); // startup
 
@@ -247,6 +250,7 @@ test.serial('device state', async t => {
   // from bootstrap, and read it back.
   await initializeSwingset(config, ['write+read'], hostStorage, initOpts);
   const c1 = await makeSwingsetController(hostStorage, {}, runtimeOpts);
+  t.teardown(c1.shutdown);
   const d3 = c1.deviceNameToID('d3');
   await c1.run();
   t.deepEqual(c1.dump().log, ['undefined', 'w+r', 'called', 'got {"s":"new"}']);
@@ -279,6 +283,7 @@ test.serial('command broadcast', async t => {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage, initOpts);
   const c = await makeSwingsetController(hostStorage, devEndows, runtimeOpts);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   c.queueToVatRoot('bootstrap', 'doCommand1', [], 'panic');
   await c.run();
@@ -308,6 +313,7 @@ test.serial('command deliver', async t => {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage, initOpts);
   const c = await makeSwingsetController(hostStorage, devEndows, runtimeOpts);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   c.queueToVatRoot('bootstrap', 'doCommand2', [], 'panic');
   await c.run();
@@ -350,6 +356,7 @@ test.serial('liveslots throws when D() gets promise', async t => {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage, initOpts);
   const c = await makeSwingsetController(hostStorage, {}, runtimeOpts);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
 
   // When liveslots catches an attempt to send a promise into D(), it throws
@@ -389,6 +396,7 @@ test.serial('syscall.callNow(promise) is vat-fatal', async t => {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage, initOpts);
   const c = await makeSwingsetController(hostStorage, {}, runtimeOpts);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   await c.run();
 
@@ -430,6 +438,7 @@ test.serial('device errors cause vat-catchable D error', async t => {
     initOpts,
   );
   const c = await makeSwingsetController(hostStorage, {}, runtimeOpts);
+  t.teardown(c.shutdown);
   await c.run();
 
   t.is(c.kpStatus(bootstrapResult), 'fulfilled'); // not 'rejected'
@@ -469,6 +478,7 @@ test.serial('foreign device nodes cause a catchable error', async t => {
     initOpts,
   );
   const c = await makeSwingsetController(hostStorage, {}, runtimeOpts);
+  t.teardown(c.shutdown);
   await c.run();
 
   t.is(c.kpStatus(bootstrapResult), 'fulfilled'); // not 'rejected'

packages/SwingSet/test/devices/test-raw-device.js

@@ -52,6 +52,7 @@ test('d1', async t => {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage, initOpts);
   const c = await makeSwingsetController(hostStorage, devEndows, runtimeOpts);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   await c.run();
 

packages/SwingSet/test/gc/test-gc-vat.js

@@ -44,6 +44,7 @@ async function dropPresence(t, dropExport) {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage);
   const c = await makeSwingsetController(hostStorage);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   t.teardown(c.shutdown);
   await c.run();
@@ -116,6 +117,7 @@ test('forward to fake zoe', async t => {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage);
   const c = await makeSwingsetController(hostStorage);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   const targetID = c.vatNameToID('target');
   c.pinVatRoot('target');

packages/SwingSet/test/metering/test-dynamic-vat-unmetered.js

@@ -30,6 +30,7 @@ test('unmetered dynamic vat', async t => {
     },
   };
   const c = await buildVatController(config, []);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
 
   // let the vatAdminService get wired up before we create any new vats

packages/SwingSet/test/promise-watcher/test-promise-watcher.js

@@ -46,6 +46,7 @@ async function testPromiseWatcher(t) {
   // ? const { kvStore } = hostStorage;
   await initializeSwingset(config, [], hostStorage);
   const c = await makeSwingsetController(hostStorage);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   await c.run();
 

packages/SwingSet/test/run-policy/test-run-policy.js

@@ -26,10 +26,10 @@ async function testCranks(t, mode) {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage);
   const c = await makeSwingsetController(hostStorage);
+  t.teardown(c.shutdown);
   c.pinVatRoot('left');
   const rightKref = c.pinVatRoot('right');
   const rightID = c.vatNameToID('right');
-  t.teardown(c.shutdown);
   await c.run();
 
   if (mode === 'messages' || mode === 'wallclock') {

packages/SwingSet/test/test-controller.js

@@ -27,6 +27,7 @@ function removeTriple(arr, a, b, c) {
 test('load empty', async t => {
   const config = {};
   const controller = await buildVatController(config);
+  t.teardown(controller.shutdown);
   await controller.run();
   t.truthy(true);
 });
@@ -42,6 +43,7 @@ async function simpleCall(t) {
   };
   const hostStorage = provideHostStorage();
   const controller = await buildVatController(config, [], { hostStorage });
+  t.teardown(controller.shutdown);
   const data = controller.dump();
   // note: data.vatTables is sorted by vatID, but we have no particular
   // reason to believe that vat1 will get a lower ID than vatAdmin, because
@@ -113,6 +115,7 @@ test('bootstrap', async t => {
     new URL('basedir-controller-2', import.meta.url).pathname,
   );
   const c = await buildVatController(config);
+  t.teardown(c.shutdown);
   await c.run();
   t.deepEqual(c.dump().log, ['buildRootObject called', 'bootstrap called']);
 });
@@ -124,6 +127,7 @@ test('XS bootstrap', async t => {
   config.defaultManagerType = 'xs-worker';
   const hostStorage = provideHostStorage();
   const c = await buildVatController(config, [], { hostStorage });
+  t.teardown(c.shutdown);
   await c.run();
   t.deepEqual(c.dump().log, ['buildRootObject called', 'bootstrap called']);
   t.is(
@@ -158,6 +162,7 @@ test('static vats are unmetered on XS', async t => {
       },
     },
   );
+  t.teardown(c.shutdown);
   await c.run();
   t.deepEqual(c.dump().log, ['buildRootObject called', 'bootstrap called']);
   t.deepEqual(limited, [false, false, false, false]);
@@ -179,6 +184,7 @@ test.serial('bootstrap export', async t => {
   );
   config.defaultManagerType = 'xs-worker';
   const c = await buildVatController(config);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
   const vatAdminVatID = c.vatNameToID('vatAdmin');
   const vatAdminDevID = c.deviceNameToID('vatAdmin');

packages/SwingSet/test/test-demos-comms.js

@@ -40,7 +40,9 @@ async function main(basedir, argv) {
   );
 
   await controller.run();
-  return controller.dump();
+  const res = controller.dump();
+  await controller.shutdown();
+  return res;
 }
 
 const encouragementBotCommsGolden = [

packages/SwingSet/test/test-demos.js

@@ -32,7 +32,9 @@ async function main(basedir, argv) {
     deviceEndowments,
   );
   await controller.run();
-  return controller.dump();
+  const res = controller.dump();
+  await controller.shutdown();
+  return res;
 }
 
 const encouragementBotGolden = [

packages/SwingSet/test/test-device-bridge.js

@@ -81,6 +81,7 @@ test('bridge device', async t => {
   };
 
   const c2 = await makeSwingsetController(hostStorage, endowments2);
+  t.teardown(c2.shutdown);
   await c2.run();
   // The bootstrap is reloaded from transcript, which means it doesn't run
   // any syscalls (they are switched off during replay), so it won't re-run

packages/SwingSet/test/test-exomessages.js

@@ -12,6 +12,7 @@ async function beginning(t, mode) {
     },
   };
   const controller = await buildVatController(config, [mode]);
+  t.teardown(controller.shutdown);
   t.is(controller.kpStatus(controller.bootstrapResult), 'unresolved');
   return controller;
 }

packages/SwingSet/test/test-gc-kernel.js

@@ -1071,6 +1071,7 @@ test('terminated vat', async t => {
     },
   };
   const c = await buildVatController(config, []);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
 
   function getRefCountsAndOwners() {
@@ -1217,6 +1218,7 @@ test.serial('device transfer', async t => {
   const hostStorage = provideHostStorage();
   await initializeSwingset(config, [], hostStorage);
   const c = await makeSwingsetController(hostStorage);
+  t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
 
   // The bootstrap() message is already queued. When we call c.step(), it