fix: use ses-ava in SwingSet where possible

Agoric · Mar 24, 2021 · 20b04a4 · 20b04a4
1 parent 8306b3c
commit 20b04a4
Show file tree

Hide file tree

Showing 33 changed files with 91 additions and 65 deletions.
diff --git a/packages/SwingSet/test/definition/test-vat-definition.js b/packages/SwingSet/test/definition/test-vat-definition.js
@@ -1,6 +1,6 @@
 /* global require */
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../../tools/prepare-test-env';
+
 import { buildVatController } from '../../src/index';
 
 const mUndefined = { '@qclass': 'undefined' };

diff --git a/packages/SwingSet/test/test-comms.js b/packages/SwingSet/test/test-comms.js
@@ -1,15 +1,12 @@
-import { wrapTest } from '@agoric/ses-ava';
-import '@agoric/install-ses';
-import rawTest from 'ava';
+import { test } from '../tools/prepare-test-env';
+
 import buildCommsDispatch from '../src/vats/comms';
 import { flipRemoteSlot } from '../src/vats/comms/parseRemoteSlot';
 import { makeState, makeStateKit } from '../src/vats/comms/state';
 import { makeCListKit } from '../src/vats/comms/clist';
 import { addRemote } from '../src/vats/comms/remote';
 import { debugState } from '../src/vats/comms/dispatch';
 
-const test = wrapTest(rawTest);
-
 test('provideRemoteForLocal', t => {
   const s = makeState(0);
   const stateKit = makeStateKit(s);

diff --git a/packages/SwingSet/test/test-controller.js b/packages/SwingSet/test/test-controller.js
@@ -1,6 +1,7 @@
 /* global require __dirname */
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
+
+// eslint-disable-next-line import/order
 import path from 'path';
 import { buildVatController, loadBasedir } from '../src/index';
 import { checkKT } from './util';

diff --git a/packages/SwingSet/test/test-demos-comms.js b/packages/SwingSet/test/test-demos-comms.js
@@ -1,7 +1,8 @@
 /* global __dirname */
-import '@agoric/install-ses';
+// eslint-disable-next-line import/order
+import { test } from '../tools/prepare-test-env';
+
 import { initSwingStore } from '@agoric/swing-store-simple';
-import test from 'ava';
 import path from 'path';
 import { buildLoopbox } from '../src/devices/loopbox';
 import {

diff --git a/packages/SwingSet/test/test-demos.js b/packages/SwingSet/test/test-demos.js
@@ -1,7 +1,8 @@
 /* global __dirname */
-import '@agoric/install-ses';
+// eslint-disable-next-line import/order
+import { test } from '../tools/prepare-test-env';
+
 import { initSwingStore } from '@agoric/swing-store-simple';
-import test from 'ava';
 import path from 'path';
 import { buildLoopbox } from '../src/devices/loopbox';
 import {

diff --git a/packages/SwingSet/test/test-device-bridge.js b/packages/SwingSet/test/test-device-bridge.js
@@ -1,6 +1,7 @@
 /* global require */
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
+
+// eslint-disable-next-line import/order
 import { initSwingStore } from '@agoric/swing-store-simple';
 
 import {

diff --git a/packages/SwingSet/test/test-exomessages.js b/packages/SwingSet/test/test-exomessages.js
@@ -1,6 +1,6 @@
 /* global require */
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
+
 import { buildVatController } from '../src/index';
 
 async function beginning(t, mode) {

diff --git a/packages/SwingSet/test/test-fake-weakref.js b/packages/SwingSet/test/test-fake-weakref.js
@@ -1,5 +1,5 @@
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
+
 import { WeakRef, FinalizationRegistry } from '../src/weakref';
 
 // We don't test that WeakRefs actually work, we only make sure we can

diff --git a/packages/SwingSet/test/test-kernel.js b/packages/SwingSet/test/test-kernel.js
@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../tools/prepare-test-env';
+
 import anylogger from 'anylogger';
 import { initSwingStore } from '@agoric/swing-store-simple';
 import { assert, details as X } from '@agoric/assert';

diff --git a/packages/SwingSet/test/test-liveslots.js b/packages/SwingSet/test/test-liveslots.js
@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../tools/prepare-test-env';
+
 import { E } from '@agoric/eventual-send';
 import { Far } from '@agoric/marshal';
 import { assert, details as X } from '@agoric/assert';

diff --git a/packages/SwingSet/test/test-marshal.js b/packages/SwingSet/test/test-marshal.js
@@ -1,7 +1,8 @@
 /* global setImmediate */
-import '@agoric/install-ses';
+// eslint-disable-next-line import/order
+import { test } from '../tools/prepare-test-env';
+
 import { Far } from '@agoric/marshal';
-import test from 'ava';
 import { makePromiseKit } from '@agoric/promise-kit';
 
 import { WeakRef, FinalizationRegistry } from '../src/weakref';

diff --git a/packages/SwingSet/test/test-netstring.js b/packages/SwingSet/test/test-netstring.js
@@ -1,7 +1,6 @@
 /* global Buffer */
-import '@agoric/install-ses'; // adds 'harden' to global
+import { test } from '../tools/prepare-test-env';
 
-import test from 'ava';
 import {
   encode,
   decode,

diff --git a/packages/SwingSet/test/test-network.js b/packages/SwingSet/test/test-network.js
@@ -1,5 +1,6 @@
-import '@agoric/install-ses'; // adds 'harden' to global
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
+
+// eslint-disable-next-line import/order
 import { makePromiseKit } from '@agoric/promise-kit';
 
 import {

diff --git a/packages/SwingSet/test/test-node-version.js b/packages/SwingSet/test/test-node-version.js
@@ -1,7 +1,9 @@
 // eslint-disable-next-line no-redeclare
 /* global process */
+import { test } from '../tools/prepare-test-env';
+
+// eslint-disable-next-line import/order
 import semver from 'semver';
-import test from 'ava';
 
 test('Node version for IO queue priority', t => {
   t.true(

diff --git a/packages/SwingSet/test/test-promises.js b/packages/SwingSet/test/test-promises.js
@@ -1,6 +1,7 @@
 /* global __dirname */
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
+
+// eslint-disable-next-line import/order
 import path from 'path';
 import {
   buildVatController,

diff --git a/packages/SwingSet/test/test-queue-priority.js b/packages/SwingSet/test/test-queue-priority.js
@@ -1,6 +1,6 @@
 // eslint-disable-next-line no-redeclare
 /* global setImmediate setTimeout */
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
 
 test('Promise queue should be higher priority than IO/timer queue', async t => {
   const log = [];

diff --git a/packages/SwingSet/test/test-state.js b/packages/SwingSet/test/test-state.js
@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
+
+// eslint-disable-next-line import/order
 import {
   initSwingStore,
   getAllState,

diff --git a/packages/SwingSet/test/test-syscall-failure.js b/packages/SwingSet/test/test-syscall-failure.js
@@ -1,6 +1,7 @@
 /* global require */
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
+
+// eslint-disable-next-line import/order
 import { initSwingStore } from '@agoric/swing-store-simple';
 import { buildVatController } from '../src';
 

diff --git a/packages/SwingSet/test/test-tildot.js b/packages/SwingSet/test/test-tildot.js
@@ -1,6 +1,6 @@
 /* global require */
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
+
 import { buildVatController } from '../src/index';
 
 test('vat code can use tildot', async t => {

diff --git a/packages/SwingSet/test/test-timer-device.js b/packages/SwingSet/test/test-timer-device.js
@@ -1,5 +1,5 @@
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
+
 import { makeTimerMap, curryPollFn } from '../src/devices/timer-src';
 
 test('multiMap multi store', t => {

diff --git a/packages/SwingSet/test/test-transcript-light.js b/packages/SwingSet/test/test-transcript-light.js
@@ -1,6 +1,7 @@
 /* global __dirname */
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../tools/prepare-test-env';
+
 import path from 'path';
 import {
   initSwingStore,

diff --git a/packages/SwingSet/test/test-transcript.js b/packages/SwingSet/test/test-transcript.js
@@ -1,6 +1,7 @@
 /* global __dirname */
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../tools/prepare-test-env';
+
 import path from 'path';
 // import fs from 'fs';
 import {

diff --git a/packages/SwingSet/test/test-vat-env.js b/packages/SwingSet/test/test-vat-env.js
@@ -2,7 +2,7 @@
 import '@agoric/swingset-vat/tools/prepare-test-env';
 import { Far } from '@agoric/marshal';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
 
 test('harden from SES is in the vat environment', t => {
   harden();

diff --git a/packages/SwingSet/test/test-vattp.js b/packages/SwingSet/test/test-vattp.js
@@ -1,6 +1,7 @@
 /* global require */
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../tools/prepare-test-env';
+
+// eslint-disable-next-line import/order
 import { initSwingStore } from '@agoric/swing-store-simple';
 import { initializeSwingset, makeSwingsetController } from '../src/index';
 import { buildMailboxStateMap, buildMailbox } from '../src/devices/mailbox';

diff --git a/packages/SwingSet/test/test-vpid-kernel.js b/packages/SwingSet/test/test-vpid-kernel.js
@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../tools/prepare-test-env';
+
 import anylogger from 'anylogger';
 import { initSwingStore } from '@agoric/swing-store-simple';
 import { assert, details as X } from '@agoric/assert';

diff --git a/packages/SwingSet/test/test-vpid-liveslots.js b/packages/SwingSet/test/test-vpid-liveslots.js
@@ -1,8 +1,7 @@
 // eslint-disable-next-line no-redeclare
 /* global setImmediate */
-
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../tools/prepare-test-env';
 
 import { E } from '@agoric/eventual-send';
 import { makePromiseKit } from '@agoric/promise-kit';

diff --git a/packages/SwingSet/test/test-worker-protocol.js b/packages/SwingSet/test/test-worker-protocol.js
@@ -1,7 +1,6 @@
 /* global Buffer */
-import '@agoric/install-ses'; // adds 'harden' to global
+import { test } from '../tools/prepare-test-env';
 
-import test from 'ava';
 import { arrayEncoderStream, arrayDecoderStream } from '../src/worker-protocol';
 import {
   encode,

diff --git a/packages/SwingSet/test/timer-device/test-device.js b/packages/SwingSet/test/timer-device/test-device.js
@@ -1,6 +1,7 @@
 /* global require */
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../../tools/prepare-test-env';
+
+// eslint-disable-next-line import/order
 import { initSwingStore } from '@agoric/swing-store-simple';
 
 import { initializeSwingset, makeSwingsetController } from '../../src/index';

diff --git a/packages/SwingSet/test/virtualObjects/test-representatives.js b/packages/SwingSet/test/virtualObjects/test-representatives.js
@@ -1,7 +1,8 @@
 /* global __dirname */
-import '@agoric/install-ses';
+import { test } from '../../tools/prepare-test-env';
+
+// eslint-disable-next-line import/order
 import path from 'path';
-import test from 'ava';
 import { buildVatController } from '../../src/index';
 import makeNextLog from '../make-nextlog';
 

diff --git a/packages/SwingSet/test/virtualObjects/test-virtualObjectCache.js b/packages/SwingSet/test/virtualObjects/test-virtualObjectCache.js
@@ -1,5 +1,5 @@
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../../tools/prepare-test-env';
+
 import { makeCache } from '../../src/kernel/virtualObjectManager';
 
 function makeFakeStore() {

diff --git a/packages/SwingSet/test/virtualObjects/test-virtualObjectManager.js b/packages/SwingSet/test/virtualObjects/test-virtualObjectManager.js
@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../../tools/prepare-test-env';
+
+// eslint-disable-next-line import/order
 import { Far } from '@agoric/marshal';
 import { makeFakeVirtualObjectManager } from '../../tools/fakeVirtualObjectManager';
 

diff --git a/packages/SwingSet/test/workers/test-worker.js b/packages/SwingSet/test/workers/test-worker.js
@@ -1,6 +1,6 @@
 /* global require __dirname */
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../../tools/prepare-test-env';
+
 import { loadBasedir, buildVatController } from '../../src/index';
 
 const expected = [['B good', 'C good', 'F good', 'three good'], 'rp3 good'];

diff --git a/packages/SwingSet/tools/prepare-test-env.js b/packages/SwingSet/tools/prepare-test-env.js
@@ -6,10 +6,22 @@
  * for virtual objects: makeKind, makeWeakStore
  */
 
+// eslint thinks these are extraneous dependencies because this file
+// is in the tools/ directory rather than the test/ directory.
+// TODO How do we tell eslint that tools/ is dev-only? Either
+// that, or should we just move tools/* into test/ ?
+//
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { wrapTest } from '@agoric/ses-ava';
 import './install-ses-debug';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import rawTest from 'ava';
+
 import { makeFakeVirtualObjectManager } from './fakeVirtualObjectManager';
 
 const { makeKind, makeWeakStore } = makeFakeVirtualObjectManager(3);
 
 globalThis.makeKind = makeKind;
 globalThis.makeWeakStore = makeWeakStore;
+
+export const test = wrapTest(rawTest);