@agoric/swingset-liveslots 0.10.3-u19.2 → 0.10.3-u20.0

package/test/virtual-objects/virtualObjectGC.test.js

@@ -3,6 +3,7 @@ import test from 'ava';
 
 import { Far } from '@endo/marshal';
 import { krefOf, kser, kslot } from '@agoric/kmarshal';
+import { avaRetry } from '@agoric/internal/tools/avaRetry.js';
 import {
   setupTestLiveslots,
   findSyscallsByType,
@@ -437,10 +438,10 @@ async function voLifeCycleTest1(t, isf) {
   await dispatchMessageSuccessfully('dropHeld');
   assertState(v, vref, false, 'erv');
 }
-test.serial('VO lifecycle 1 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 1 unfaceted', async t => {
   await voLifeCycleTest1(t, false);
 });
-test.serial('VO lifecycle 1 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 1 faceted', async t => {
   await voLifeCycleTest1(t, true);
 });
 
@@ -519,10 +520,10 @@ async function voLifeCycleTest2(t, isf) {
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), []);
 }
 
-test.serial('VO lifecycle 2 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 2 unfaceted', async t => {
   await voLifeCycleTest2(t, false);
 });
-test.serial('VO lifecycle 2 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 2 faceted', async t => {
   await voLifeCycleTest2(t, true);
 });
 
@@ -567,10 +568,10 @@ async function voLifeCycleTest3(t, isf) {
   t.deepEqual(findSyscallsByType(v.log, 'dropExports'), []);
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), []);
 }
-test.serial('VO lifecycle 3 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 3 unfaceted', async t => {
   await voLifeCycleTest3(t, false);
 });
-test.serial('VO lifecycle 3 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 3 faceted', async t => {
   await voLifeCycleTest3(t, true);
 });
 
@@ -600,10 +601,10 @@ async function voLifeCycleTest4(t, isf) {
   const expected = { type: 'retireExports', slots: [vref] };
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), [expected]);
 }
-test.serial('VO lifecycle 4 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 4 unfaceted', async t => {
   await voLifeCycleTest4(t, false);
 });
-test.serial('VO lifecycle 4 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 4 faceted', async t => {
   await voLifeCycleTest4(t, true);
 });
 
@@ -640,10 +641,10 @@ async function voLifeCycleTest5(t, isf) {
   t.deepEqual(findSyscallsByType(v.log, 'dropExports'), []);
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), []);
 }
-test.serial('VO lifecycle 5 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 5 unfaceted', async t => {
   await voLifeCycleTest5(t, false);
 });
-test.serial('VO lifecycle 5 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 5 faceted', async t => {
   await voLifeCycleTest5(t, true);
 });
 
@@ -689,10 +690,10 @@ async function voLifeCycleTest6(t, isf) {
   const expected = { type: 'retireExports', slots: [vref] };
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), [expected]);
 }
-test.serial('VO lifecycle 6 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 6 unfaceted', async t => {
   await voLifeCycleTest6(t, false);
 });
-test.serial('VO lifecycle 6 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 6 faceted', async t => {
   await voLifeCycleTest6(t, true);
 });
 
@@ -730,10 +731,10 @@ async function voLifeCycleTest7(t, isf) {
   const expected = { type: 'retireExports', slots: [vref] };
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), [expected]);
 }
-test.serial('VO lifecycle 7 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 7 unfaceted', async t => {
   await voLifeCycleTest7(t, false);
 });
-test.serial('VO lifecycle 7 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 7 faceted', async t => {
   await voLifeCycleTest7(t, true);
 });
 
@@ -779,15 +780,15 @@ async function voLifeCycleTest8(t, isf) {
   const expected = { type: 'retireExports', slots: [vref] };
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), [expected]);
 }
-test.serial('VO lifecycle 8 unfaceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 8 unfaceted', async t => {
   await voLifeCycleTest8(t, false);
 });
-test.serial('VO lifecycle 8 faceted', async t => {
+avaRetry(test.serial, 'VO lifecycle 8 faceted', async t => {
   await voLifeCycleTest8(t, true);
 });
 
 // multifacet export test 1: no export
-test.serial('VO multifacet export 1', async t => {
+avaRetry(test.serial, 'VO multifacet export 1', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(
     t,
     buildRootObject,
@@ -808,7 +809,7 @@ test.serial('VO multifacet export 1', async t => {
 });
 
 // multifacet export test 2a: export A, drop A, retire A
-test.serial('VO multifacet export 2a', async t => {
+avaRetry(test.serial, 'VO multifacet export 2a', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports } =
     await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const vref = facetRef(true, thingVref(true, 2), '0');
@@ -836,7 +837,7 @@ test.serial('VO multifacet export 2a', async t => {
 });
 
 // multifacet export test 2b: export B, drop B, retire B
-test.serial('VO multifacet export 2b', async t => {
+avaRetry(test.serial, 'VO multifacet export 2b', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports } =
     await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const vref = facetRef(true, thingVref(true, 2), '1');
@@ -863,7 +864,7 @@ test.serial('VO multifacet export 2b', async t => {
 });
 
 // multifacet export test 3abba: export A, export B, drop B, drop A, retire
-test.serial('VO multifacet export 3abba', async t => {
+avaRetry(test.serial, 'VO multifacet export 3abba', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports } =
     await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const vrefA = facetRef(true, thingVref(true, 2), '0');
@@ -901,7 +902,7 @@ test.serial('VO multifacet export 3abba', async t => {
 });
 
 // multifacet export test 3abab: export A, export B, drop A, drop B, retire
-test.serial('VO multifacet export 3abab', async t => {
+avaRetry(test.serial, 'VO multifacet export 3abab', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports } =
     await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const vrefA = facetRef(true, thingVref(true, 2), '0');
@@ -938,7 +939,7 @@ test.serial('VO multifacet export 3abab', async t => {
   t.deepEqual(findSyscallsByType(v.log, 'retireExports'), [expected]);
 });
 
-test.serial('VO multifacet markers only', async t => {
+avaRetry(test.serial, 'VO multifacet markers only', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(
     t,
     buildRootObject,
@@ -993,10 +994,10 @@ async function voRefcountManagementTest1(t, isf) {
   t.is(fakestore.get(`vom.rc.${baseRef}`), undefined);
   assertState(v, vref, false, 'erv');
 }
-test.serial('VO refcount management 1 unfaceted', async t => {
+avaRetry(test.serial, 'VO refcount management 1 unfaceted', async t => {
   await voRefcountManagementTest1(t, false);
 });
-test.serial('VO refcount management 1 faceted', async t => {
+avaRetry(test.serial, 'VO refcount management 1 faceted', async t => {
   await voRefcountManagementTest1(t, true);
 });
 
@@ -1034,10 +1035,10 @@ async function voRefcountManagementTest2(t, isf) {
   t.is(fakestore.get(`vom.rc.${baseRef}`), undefined);
   assertState(v, vref, false, 'erv');
 }
-test.serial('VO refcount management 2 unfaceted', async t => {
+avaRetry(test.serial, 'VO refcount management 2 unfaceted', async t => {
   await voRefcountManagementTest2(t, false);
 });
-test.serial('VO refcount management 2 faceted', async t => {
+avaRetry(test.serial, 'VO refcount management 2 faceted', async t => {
   await voRefcountManagementTest2(t, true);
 });
 
@@ -1084,15 +1085,15 @@ async function voRefcountManagementTest3(t, isf) {
   t.is(fakestore.get(`vom.${holderVrefs[1]}`), undefined);
   t.is(fakestore.get(`vom.${holderVrefs[2]}`), undefined);
 }
-test.serial('VO refcount management 3 unfaceted', async t => {
+avaRetry(test.serial, 'VO refcount management 3 unfaceted', async t => {
   await voRefcountManagementTest3(t, false);
 });
-test.serial('VO refcount management 3 faceted', async t => {
+avaRetry(test.serial, 'VO refcount management 3 faceted', async t => {
   await voRefcountManagementTest3(t, true);
 });
 
 // prettier-ignore
-test.serial('presence refcount management 1', async t => {
+avaRetry(test.serial, 'presence refcount management 1', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const { fakestore } = v;
 
@@ -1131,7 +1132,7 @@ test.serial('presence refcount management 1', async t => {
 });
 
 // prettier-ignore
-test.serial('presence refcount management 2', async t => {
+avaRetry(test.serial, 'presence refcount management 2', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const { fakestore } = v;
 
@@ -1169,7 +1170,7 @@ test.serial('presence refcount management 2', async t => {
 });
 
 // prettier-ignore
-test.serial('remotable refcount management 1', async t => {
+avaRetry(test.serial, 'remotable refcount management 1', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const { fakestore } = v;
 
@@ -1212,7 +1213,7 @@ test.serial('remotable refcount management 1', async t => {
 });
 
 // prettier-ignore
-test.serial('remotable refcount management 2', async t => {
+avaRetry(test.serial, 'remotable refcount management 2', async t => {
   const { v, dispatchMessageSuccessfully } = await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const { fakestore } = v;
 
@@ -1255,15 +1256,15 @@ async function voWeakKeyGCTest(t, isf) {
   t.is(testHooks.countWeakKeysForCollection(aWeakSet), 0);
   t.is(fakestore.get(`vom.${baseRef}`), undefined);
 }
-test.serial('verify VO weak key GC unfaceted', async t => {
+avaRetry(test.serial, 'verify VO weak key GC unfaceted', async t => {
   await voWeakKeyGCTest(t, false);
 });
-test.serial('verify VO weak key GC faceted', async t => {
+avaRetry(test.serial, 'verify VO weak key GC faceted', async t => {
   await voWeakKeyGCTest(t, true);
 });
 
 // prettier-ignore
-test.serial('verify presence weak key GC', async t => {
+avaRetry(test.serial, 'verify presence weak key GC', async t => {
   const { v, dispatchMessageSuccessfully, dispatchRetireImports, testHooks } =
         await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const vref = 'o-5';
@@ -1314,7 +1315,7 @@ test.serial('verify presence weak key GC', async t => {
 // designate references to a non-VO.
 
 // prettier-ignore
-test.serial('VO holding non-VO', async t => {
+avaRetry(test.serial, 'VO holding non-VO', async t => {
   const { v, dispatchMessageSuccessfully, dispatchDropExports, dispatchRetireExports } =
         await setupTestLiveslots(t, buildRootObject, 'bob', { forceGC: true });
   const { fakestore } = v;

package/test/virtual-objects/virtualObjectManager.test.js

@@ -590,12 +590,12 @@ test('durable kind IDs can be reanimated', t => {
 
   // Store it in the store without having used it
   placeToPutIt.init('savedKindID', kindHandle);
-  t.is(log.shift(), 'get vc.4.ssavedKindID => undefined');
+  t.is(log.shift(), 'get vc.3.ssavedKindID => undefined');
   t.is(log.shift(), `get vom.rc.${khid} => undefined`);
   t.is(log.shift(), `set vom.rc.${khid} 1`);
-  t.is(log.shift(), `set vc.4.ssavedKindID ${vstr(kind)}`);
-  t.is(log.shift(), 'get vc.4.|entryCount => 0');
-  t.is(log.shift(), 'set vc.4.|entryCount 1');
+  t.is(log.shift(), `set vc.3.ssavedKindID ${vstr(kind)}`);
+  t.is(log.shift(), 'get vc.3.|entryCount => 0');
+  t.is(log.shift(), 'set vc.3.|entryCount 1');
   t.deepEqual(log, []);
 
   // Forget its Representative
@@ -609,7 +609,7 @@ test('durable kind IDs can be reanimated', t => {
 
   // Fetch it from the store, which should reanimate it
   const fetchedKindID = placeToPutIt.get('savedKindID');
-  t.is(log.shift(), `get vc.4.ssavedKindID => ${vstr(kind)}`);
+  t.is(log.shift(), `get vc.3.ssavedKindID => ${vstr(kind)}`);
   t.is(
     log.shift(),
     'get vom.dkind.10.descriptor => {"kindID":"10","tag":"testkind"}',
@@ -658,20 +658,18 @@ test('virtual object gc', t => {
   ];
   t.is(log.shift(), `get storeKindIDTable => undefined`);
   t.is(log.shift(), `set ${skit[0]} ${skit[1]}`);
+  t.is(log.shift(), 'get watcherTableID => undefined');
   t.is(log.shift(), 'set vc.1.|nextOrdinal 1');
   t.is(log.shift(), 'set vc.1.|entryCount 0');
-  t.is(log.shift(), 'get watcherTableID => undefined');
+  t.is(log.shift(), 'set watcherTableID o+d6/1');
+  t.is(log.shift(), 'get vom.rc.o+d6/1 => undefined');
+  t.is(log.shift(), 'set vom.rc.o+d6/1 1');
+  t.is(log.shift(), 'get watchedPromiseTableID => undefined');
   t.is(log.shift(), 'set vc.2.|nextOrdinal 1');
   t.is(log.shift(), 'set vc.2.|entryCount 0');
-  t.is(log.shift(), 'set watcherTableID o+d6/2');
+  t.is(log.shift(), 'set watchedPromiseTableID o+d6/2');
   t.is(log.shift(), 'get vom.rc.o+d6/2 => undefined');
   t.is(log.shift(), 'set vom.rc.o+d6/2 1');
-  t.is(log.shift(), 'get watchedPromiseTableID => undefined');
-  t.is(log.shift(), 'set vc.3.|nextOrdinal 1');
-  t.is(log.shift(), 'set vc.3.|entryCount 0');
-  t.is(log.shift(), 'set watchedPromiseTableID o+d6/3');
-  t.is(log.shift(), 'get vom.rc.o+d6/3 => undefined');
-  t.is(log.shift(), 'set vom.rc.o+d6/3 1');
   t.is(
     log.shift(),
     'set vom.vkind.10.descriptor {"kindID":"10","tag":"thing"}',
@@ -704,8 +702,6 @@ test('virtual object gc', t => {
     ['vc.1.|nextOrdinal', '1'],
     ['vc.2.|entryCount', '0'],
     ['vc.2.|nextOrdinal', '1'],
-    ['vc.3.|entryCount', '0'],
-    ['vc.3.|nextOrdinal', '1'],
     [`vom.${tbase}/1`, minThing('thing #1')],
     [`vom.${tbase}/2`, minThing('thing #2')],
     [`vom.${tbase}/3`, minThing('thing #3')],
@@ -715,12 +711,12 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/1', '1'],
     ['vom.rc.o+d6/2', '1'],
-    ['vom.rc.o+d6/3', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
-    ['watchedPromiseTableID', 'o+d6/3'],
-    ['watcherTableID', 'o+d6/2'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // This is what the finalizer would do if the local reference was dropped and GC'd
@@ -750,8 +746,6 @@ test('virtual object gc', t => {
     ['vc.1.|nextOrdinal', '1'],
     ['vc.2.|entryCount', '0'],
     ['vc.2.|nextOrdinal', '1'],
-    ['vc.3.|entryCount', '0'],
-    ['vc.3.|nextOrdinal', '1'],
     [`vom.es.${tbase}/1`, 'r'],
     [`vom.${tbase}/1`, minThing('thing #1')],
     [`vom.${tbase}/2`, minThing('thing #2')],
@@ -762,12 +756,12 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/1', '1'],
     ['vom.rc.o+d6/2', '1'],
-    ['vom.rc.o+d6/3', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
-    ['watchedPromiseTableID', 'o+d6/3'],
-    ['watcherTableID', 'o+d6/2'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // drop export -- should delete
@@ -801,8 +795,6 @@ test('virtual object gc', t => {
     ['vc.1.|nextOrdinal', '1'],
     ['vc.2.|entryCount', '0'],
     ['vc.2.|nextOrdinal', '1'],
-    ['vc.3.|entryCount', '0'],
-    ['vc.3.|nextOrdinal', '1'],
     [`vom.${tbase}/2`, minThing('thing #2')],
     [`vom.${tbase}/3`, minThing('thing #3')],
     [`vom.${tbase}/4`, minThing('thing #4')],
@@ -811,12 +803,12 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/1', '1'],
     ['vom.rc.o+d6/2', '1'],
-    ['vom.rc.o+d6/3', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
-    ['watchedPromiseTableID', 'o+d6/3'],
-    ['watcherTableID', 'o+d6/2'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // case 2: export, drop export, drop local ref
@@ -838,8 +830,6 @@ test('virtual object gc', t => {
     ['vc.1.|nextOrdinal', '1'],
     ['vc.2.|entryCount', '0'],
     ['vc.2.|nextOrdinal', '1'],
-    ['vc.3.|entryCount', '0'],
-    ['vc.3.|nextOrdinal', '1'],
     [`vom.es.${tbase}/2`, 's'],
     [`vom.${tbase}/2`, minThing('thing #2')],
     [`vom.${tbase}/3`, minThing('thing #3')],
@@ -849,12 +839,12 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/1', '1'],
     ['vom.rc.o+d6/2', '1'],
-    ['vom.rc.o+d6/3', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
-    ['watchedPromiseTableID', 'o+d6/3'],
-    ['watcherTableID', 'o+d6/2'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // drop local ref -- should delete
@@ -879,8 +869,6 @@ test('virtual object gc', t => {
     ['vc.1.|nextOrdinal', '1'],
     ['vc.2.|entryCount', '0'],
     ['vc.2.|nextOrdinal', '1'],
-    ['vc.3.|entryCount', '0'],
-    ['vc.3.|nextOrdinal', '1'],
     [`vom.${tbase}/3`, minThing('thing #3')],
     [`vom.${tbase}/4`, minThing('thing #4')],
     [`vom.${tbase}/5`, minThing('thing #5')],
@@ -888,12 +876,12 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/1', '1'],
     ['vom.rc.o+d6/2', '1'],
-    ['vom.rc.o+d6/3', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
-    ['watchedPromiseTableID', 'o+d6/3'],
-    ['watcherTableID', 'o+d6/2'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // case 3: drop local ref with no prior export
@@ -919,20 +907,18 @@ test('virtual object gc', t => {
     ['vc.1.|nextOrdinal', '1'],
     ['vc.2.|entryCount', '0'],
     ['vc.2.|nextOrdinal', '1'],
-    ['vc.3.|entryCount', '0'],
-    ['vc.3.|nextOrdinal', '1'],
     [`vom.${tbase}/4`, minThing('thing #4')],
     [`vom.${tbase}/5`, minThing('thing #5')],
     [`vom.${tbase}/6`, minThing('thing #6')],
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/1', '1'],
     ['vom.rc.o+d6/2', '1'],
-    ['vom.rc.o+d6/3', '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
-    ['watchedPromiseTableID', 'o+d6/3'],
-    ['watcherTableID', 'o+d6/2'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 
   // case 4: ref virtually, export, drop local ref, drop export
@@ -949,21 +935,19 @@ test('virtual object gc', t => {
     ['vc.1.|nextOrdinal', '1'],
     ['vc.2.|entryCount', '0'],
     ['vc.2.|nextOrdinal', '1'],
-    ['vc.3.|entryCount', '0'],
-    ['vc.3.|nextOrdinal', '1'],
     [`vom.${tbase}/4`, minThing('thing #4')],
     [`vom.${tbase}/5`, minThing('thing #5')],
     [`vom.${tbase}/6`, minThing('thing #6')],
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/1', '1'],
     ['vom.rc.o+d6/2', '1'],
-    ['vom.rc.o+d6/3', '1'],
     [`vom.rc.${tbase}/4`, '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
-    ['watchedPromiseTableID', 'o+d6/3'],
-    ['watcherTableID', 'o+d6/2'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
   // export
   setExportStatus(`${tbase}/4`, 'reachable');
@@ -1001,8 +985,6 @@ test('virtual object gc', t => {
     ['vc.1.|nextOrdinal', '1'],
     ['vc.2.|entryCount', '0'],
     ['vc.2.|nextOrdinal', '1'],
-    ['vc.3.|entryCount', '0'],
-    ['vc.3.|nextOrdinal', '1'],
     [`vom.es.${tbase}/4`, 's'],
     [`vom.es.${tbase}/5`, 'r'],
     [`vom.${tbase}/4`, minThing('thing #4')],
@@ -1011,14 +993,14 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/1', '1'],
     ['vom.rc.o+d6/2', '1'],
-    ['vom.rc.o+d6/3', '1'],
     [`vom.rc.${tbase}/4`, '1'],
     [`vom.rc.${tbase}/5`, '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
-    ['watchedPromiseTableID', 'o+d6/3'],
-    ['watcherTableID', 'o+d6/2'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
   // drop local ref -- should not delete because ref'd virtually AND exported
   pretendGC(`${tbase}/5`, false);
@@ -1046,8 +1028,6 @@ test('virtual object gc', t => {
     ['vc.1.|nextOrdinal', '1'],
     ['vc.2.|entryCount', '0'],
     ['vc.2.|nextOrdinal', '1'],
-    ['vc.3.|entryCount', '0'],
-    ['vc.3.|nextOrdinal', '1'],
     [`vom.es.${tbase}/4`, 's'],
     [`vom.es.${tbase}/5`, 's'],
     [`vom.${tbase}/4`, minThing('thing #4')],
@@ -1056,15 +1036,15 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/1', '1'],
     ['vom.rc.o+d6/2', '1'],
-    ['vom.rc.o+d6/3', '1'],
     [`vom.rc.${tbase}/4`, '1'],
     [`vom.rc.${tbase}/5`, '1'],
     [`vom.rc.${tbase}/6`, '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
-    ['watchedPromiseTableID', 'o+d6/3'],
-    ['watcherTableID', 'o+d6/2'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
   // drop local ref -- should not delete because ref'd virtually
   pretendGC(`${tbase}/6`, false);
@@ -1078,8 +1058,6 @@ test('virtual object gc', t => {
     ['vc.1.|nextOrdinal', '1'],
     ['vc.2.|entryCount', '0'],
     ['vc.2.|nextOrdinal', '1'],
-    ['vc.3.|entryCount', '0'],
-    ['vc.3.|nextOrdinal', '1'],
     [`vom.es.${tbase}/4`, 's'],
     [`vom.es.${tbase}/5`, 's'],
     [`vom.${tbase}/4`, minThing('thing #4')],
@@ -1088,15 +1066,15 @@ test('virtual object gc', t => {
     [`vom.${tbase}/7`, minThing('thing #7')],
     [`vom.${tbase}/8`, minThing('thing #8')],
     [`vom.${tbase}/9`, minThing('thing #9')],
+    ['vom.rc.o+d6/1', '1'],
     ['vom.rc.o+d6/2', '1'],
-    ['vom.rc.o+d6/3', '1'],
     [`vom.rc.${tbase}/4`, '1'],
     [`vom.rc.${tbase}/5`, '1'],
     [`vom.rc.${tbase}/6`, '1'],
     ['vom.vkind.10.descriptor', '{"kindID":"10","tag":"thing"}'],
     ['vom.vkind.11.descriptor', '{"kindID":"11","tag":"ref"}'],
-    ['watchedPromiseTableID', 'o+d6/3'],
-    ['watcherTableID', 'o+d6/2'],
+    ['watchedPromiseTableID', 'o+d6/2'],
+    ['watcherTableID', 'o+d6/1'],
   ]);
 });
 

package/test/vo-test-harness.test.js

@@ -1,5 +1,5 @@
 import test from 'ava';
-import { runVOTest } from '../tools/vo-test-harness.js';
+import { makeSpy, runVOTest } from '../tools/vo-test-harness.js';
 
 async function voTestTest(t, mode) {
   let makeThing;
@@ -36,8 +36,6 @@ async function voTestTest(t, mode) {
   await runVOTest(t, prepare, makeTestThing, testTestThing);
 }
 
-// Note: these first two are not marked "test.failing" because
-// something is wrong and we need to fix it. Rather, they are
 // confirming that the voTestTest harness would catch problems during
 // downstream tests that use the harness, if those problems arose in
 // the "before" or "after" phases, and reported by the downstream test
@@ -47,20 +45,26 @@ async function voTestTest(t, mode) {
 // fails, otherwise the harness is not doing its job, and is hiding
 // real test failures in some downstream client package.
 
-test.failing('fail during "before" phase', async t => {
-  await voTestTest(t, 'before');
+test('fail during "before" phase', async t => {
+  const tSpy = makeSpy(t);
+  await voTestTest(tSpy, 'before');
+  t.is(tSpy.failureMessage, 'deliberate failure in before phase');
 });
 
-test.failing('fail during "after" phase', async t => {
-  await voTestTest(t, 'after');
+test('fail during "after" phase', async t => {
+  const tSpy = makeSpy(t);
+  await voTestTest(tSpy, 'after');
+  t.is(tSpy.failureMessage, 'deliberate failure in after phase');
 });
 
 // Similarly, this test makes sure that our harness can detect when
 // the downstream test misbehaves and holds on to the object they were
 // supposed to drop.
 
-test.failing('fail due to held object', async t => {
-  await voTestTest(t, 'hold');
+test('fail due to held object', async t => {
+  const tSpy = makeSpy(t);
+  await voTestTest(tSpy, 'hold');
+  t.is(tSpy.falsyMessage, 'somebody continues to hold test object');
 });
 
 test.serial('succeed', async t => {

package/tools/fakeVirtualSupport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fakeVirtualSupport.d.ts","sourceRoot":"","sources":["fakeVirtualSupport.js"],"names":[],"mappings":"AAyCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuQC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAcC;AAED;;;mEA9HE,wBAEa,iDACiB,GAAI,gDAI/B,GAAI,4BACuB,iBACtB;kFAgD6D,iBAC/D;EAmFP;AAED;;;;;;;;;;GAUG;AACH,+CAPG;IAAyB,SAAS;IACR,oBAAoB;IACR,SAAS;IACV,OAAO;IACP,OAAO;IAClB,IAAI;CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qEAjFH,GAC9B,+IAKuB,GAAG;0EAQd,GAAG,uJAKV,GAAG;+HAeL,GAAG,+IAKiB,GAAG;oIAOA,GAC1B,uJAGG,GAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uEAzHJ,wBAEa,iDACiB,GAAI,gDAI/B,GAAI,4BACuB,iBACtB;sFAgD6D,iBAC/D;;EA+GP;AAED;;;;;;;;iEApG+B,GAC9B,+IAKuB,GAAG;sEAQd,GAAG,uJAKV,GAAG;2HAeL,GAAG,+IAKiB,GAAG;gIAOA,GAC1B,uJAGG,GAAE;;;;;;;;;;;;;;;;;;;EA0DL;AAED;;;;;;;;;;;;EAMC"}
+{"version":3,"file":"fakeVirtualSupport.d.ts","sourceRoot":"","sources":["fakeVirtualSupport.js"],"names":[],"mappings":"AAyCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuQC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAcC;AAED;;;mEAhIiB,wBAAmB,iDAIZ,GAAI,gDAE1B,GAAC,4BAGc,iBAAY;kFAkDJ,iBAAY;EAoFpC;AAED;;;;;;;;;;GAUG;AACH,+CAPG;IAAyB,SAAS;IACR,oBAAoB;IACR,SAAS;IACV,OAAO;IACP,OAAO;IAClB,IAAI;CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qEAjFH,GAC9B,+IAKuB,GAAG;0EAQd,GAAG,uJAKV,GAAG;+HAeL,GAAG,+IAKiB,GAAG;oIAOA,GAC1B,uJAGG,GAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uEA3HW,wBAAmB,iDAIZ,GAAI,gDAE1B,GAAC,4BAGc,iBAAY;sFAkDJ,iBAAY;;EAgHpC;AAED;;;;;;;;iEApG+B,GAC9B,+IAKuB,GAAG;sEAQd,GAAG,uJAKV,GAAG;2HAeL,GAAG,+IAKiB,GAAG;gIAOA,GAC1B,uJAGG,GAAE;;;;;;;;;;;;;;;;;;;EA0DL;AAED;;;;;;;;;;;;EAMC"}

package/tools/setup-vat-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-vat-data.d.ts","sourceRoot":"","sources":["setup-vat-data.js"],"names":[],"mappings":"AA4DO,2CAHI,OAAO,CAAC,kBAAkB,CAAC,GACzB,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAelD;AAOM,sCAHI,OAAO,CAAC,kBAAkB,CAAC,GACzB,kBAAkB,CAiB9B;yBAjFa,UAAU,CAAC,OAAO,oBAAoB,CAAC;iCAmCxC,OAAO,kBAAkB,EAAE,QAAQ,CAC3C,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC,GACxF;IAAM,UAAU,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAC3D;qCA1CiC,yBAAyB"}
+{"version":3,"file":"setup-vat-data.d.ts","sourceRoot":"","sources":["setup-vat-data.js"],"names":[],"mappings":"AA2DO,2CAHI,OAAO,CAAC,kBAAkB,CAAC,GACzB,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAelD;AAOM,sCAHI,OAAO,CAAC,kBAAkB,CAAC,GACzB,kBAAkB,CAiB9B;yBAjFa,UAAU,CAAC,OAAO,oBAAoB,CAAC;iCAmCxC,OAAO,kBAAkB,EAAE,QAAQ,CAC3C,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC,GACxF;IAAM,UAAU,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAC3D;qCA1CiC,yBAAyB"}

package/tools/setup-vat-data.js

@@ -1,4 +1,3 @@
-// @ts-check
 /* global globalThis */
 
 // This file produces the globalThis.VatData property outside of a