More ses-ava (Agoric#2740)

* fix: more ses-ava

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

@@ -1,6 +1,7 @@
 /* global require __dirname */
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '../../tools/prepare-test-env-ava';
+
+// eslint-disable-next-line import/order
 import { initSwingStore } from '@agoric/swing-store-simple';
 
 import {

packages/SwingSet/test/test-devices.js

@@ -1,6 +1,7 @@
 /* global require */
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/order
+import { test } from '../tools/prepare-test-env-ava';
+
 import bundleSource from '@agoric/bundle-source';
 import { initSwingStore, getAllState } from '@agoric/swing-store-simple';
 

packages/SwingSet/test/test-message-patterns.js

@@ -3,8 +3,14 @@
 /* eslint dot-notation: "off" */
 /* eslint object-shorthand: "off" */
 
-import '@agoric/install-ses';
+// `test.serial` does not yet seem compatible with ses-ava
+// See https://github.com/endojs/endo/issues/647
+// TODO restore
+// import { test } from '../tools/prepare-test-env-ava';
+import '../tools/prepare-test-env';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';
+
 import path from 'path';
 import bundleSource from '@agoric/bundle-source';
 import { initSwingStore } from '@agoric/swing-store-simple';

packages/agoric-cli/integration-tests/test-workflow.js

@@ -1,8 +1,9 @@
 /* global __dirname process setTimeout clearTimeout setInterval clearInterval */
-/* eslint-disable import/no-extraneous-dependencies */
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import fs from 'fs';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import tmp from 'tmp';
 import { makePromiseKit } from '@agoric/promise-kit';
 import { request } from 'http';

packages/agoric-cli/package.json

@@ -20,6 +20,7 @@
     "lint-fix": "eslint --fix '**/*.{js,jsx}'"
   },
   "devDependencies": {
+    "@agoric/swingset-vat": "^0.14.0",
     "ava": "^3.12.1",
     "nyc": "^15.1.0",
     "tmp": "^0.1.0"

packages/cosmic-swingset/test/test-home.js

@@ -1,6 +1,13 @@
 /* global require process */
-import '@agoric/install-ses';
+
+// `test.after.always` does not yet seem compatible with ses-ava
+// See https://github.com/endojs/endo/issues/647
+// TODO restore
+// import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+import '@agoric/swingset-vat/tools/prepare-test-env';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import test from 'ava';
+
 import bundleSource from '@agoric/bundle-source';
 import { Far } from '@agoric/marshal';
 

packages/cosmic-swingset/test/unitTests/test-lib-board.js

@@ -1,7 +1,4 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
 
 import { Far } from '@agoric/marshal';
 import { makeBoard } from '../../lib/ag-solo/vats/lib-board';

packages/cosmic-swingset/test/unitTests/test-name-hub.js

@@ -1,5 +1,4 @@
-import '@agoric/install-ses';
-import test from 'ava';
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
 
 import { makeNameHubKit } from '../../lib/ag-solo/vats/nameHub';
 
@@ -28,7 +27,7 @@ test('makeNameHubKit - reserve and update', async t => {
   const { nameAdmin, nameHub } = makeNameHubKit();
 
   await t.throwsAsync(() => nameHub.lookup('hello'), {
-    message: '"nameKey" not found: (a string)',
+    message: /"nameKey" not found: .*/,
   });
 
   // Try reserving and looking up.
@@ -52,7 +51,7 @@ test('makeNameHubKit - reserve and delete', async t => {
   const { nameAdmin, nameHub } = makeNameHubKit();
 
   await t.throwsAsync(() => nameHub.lookup('goodbye'), {
-    message: '"nameKey" not found: (a string)',
+    message: /"nameKey" not found: .*/,
   });
 
   nameAdmin.reserve('goodbye');
@@ -64,11 +63,11 @@ test('makeNameHubKit - reserve and delete', async t => {
   t.falsy(lookedUpGoodbye);
   nameAdmin.delete('goodbye');
   await t.throwsAsync(lookupGoodbyeP, {
-    message: '"nameKey" not found: (a string)',
+    message: /"nameKey" not found: .*/,
   });
   t.truthy(lookedUpGoodbye);
 
   await t.throwsAsync(() => nameHub.lookup('goodbye'), {
-    message: '"nameKey" not found: (a string)',
+    message: /"nameKey" not found: .*/,
   });
 });

packages/dapp-svelte-wallet/api/test/test-getPursesNotifier.js

@@ -1,5 +1,5 @@
 // @ts-check
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava'; // calls lockdown()
+import { test } from '@agoric/zoe/tools/prepare-test-env-ava';
 
 import { makeIssuerKit } from '@agoric/ertp';
 import { makeZoe } from '@agoric/zoe';

packages/dapp-svelte-wallet/api/test/test-lib-dehydrate.js

@@ -1,4 +1,4 @@
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava'; // calls lockdown()
+import { test } from '@agoric/zoe/tools/prepare-test-env-ava';
 
 import { Far } from '@agoric/marshal';
 

packages/dapp-svelte-wallet/api/test/test-lib-wallet.js

@@ -1,6 +1,6 @@
 /* global require */
 // @ts-check
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava'; // calls lockdown()
+import { test } from '@agoric/zoe/tools/prepare-test-env-ava';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import bundleSource from '@agoric/bundle-source';

packages/deploy-script-support/test/unitTests/test-assertOfferResult.js

@@ -1,5 +1,4 @@
 // @ts-check
-
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava';
 
 import { assertOfferResult } from '../../src/assertOfferResult';

packages/deploy-script-support/test/unitTests/test-depositInvitation.js

@@ -1,5 +1,4 @@
 // @ts-check
-
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava';
 
 import { makeIssuerKit, MathKind } from '@agoric/ertp';

packages/deploy-script-support/test/unitTests/test-findInvitationAmount.js

@@ -1,5 +1,4 @@
 // @ts-check
-
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava';
 
 import { makeIssuerKit, MathKind } from '@agoric/ertp';

packages/deploy-script-support/test/unitTests/test-install.js

@@ -1,6 +1,5 @@
 /* global require */
 // @ts-check
-
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava';
 
 import { makeZoe } from '@agoric/zoe';

packages/deploy-script-support/test/unitTests/test-offer.js

@@ -1,6 +1,5 @@
 /* global require */
 // @ts-check
-
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava';
 
 import { makeZoe } from '@agoric/zoe';

packages/deploy-script-support/test/unitTests/test-resolvePathForLocalContract.js

@@ -1,6 +1,5 @@
 /* global require */
 // @ts-check
-
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava';
 
 import { makeResolvePaths } from '../../src/resolvePath';

packages/deploy-script-support/test/unitTests/test-resolvePathForPackagedContract.js

@@ -1,6 +1,5 @@
 /* global require */
 // @ts-check
-
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava';
 
 import { makeResolvePaths } from '../../src/resolvePath';

packages/deploy-script-support/test/unitTests/test-saveLocalAmountMaths.js

@@ -1,5 +1,4 @@
 // @ts-check
-
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava';
 
 import { makeIssuerKit } from '@agoric/ertp';

packages/deploy-script-support/test/unitTests/test-startInstance.js

@@ -1,6 +1,5 @@
 /* global require */
 // @ts-check
-
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava';
 
 import { makeZoe } from '@agoric/zoe';

packages/eventual-send/package.json

@@ -28,6 +28,7 @@
   "devDependencies": {
     "@agoric/assert": "^0.2.4",
     "@agoric/install-ses": "^0.5.4",
+    "@agoric/swingset-vat": "^0.14.0",
     "ava": "^3.12.1",
     "esm": "^3.2.7",
     "nyc": "^15.1.0",

packages/eventual-send/test/test-deep-send.js

@@ -2,9 +2,9 @@
 // automated test. Rather, its purpose is just to run it to see what a
 // deep stack looks like.
 
-import '@agoric/install-ses';
-import test from 'ava';
-import { assert } from '@agoric/assert';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import { E } from './get-hp';
 
 const { freeze } = Object;

packages/eventual-send/test/test-deep-stacks.js

@@ -2,9 +2,9 @@
 // automated test. Rather, its purpose is just to run it to see what a
 // deep stack looks like.
 
-import '@agoric/install-ses';
-import test from 'ava';
-import { assert } from '@agoric/assert';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import { E } from './get-hp';
 
 test('deep-stacks when', t => {

packages/eventual-send/test/test-e.js

@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import { E, HandledPromise } from './get-hp';
 
 test('E reexports', async t => {

packages/eventual-send/test/test-eventual-send.js

@@ -1,10 +1,11 @@
 /* global setTimeout */
-import '@agoric/install-ses';
-import test from 'ava';
-import { assert, details as X } from '@agoric/assert';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import { HandledPromise } from './get-hp';
 
 const { getPrototypeOf } = Object;
+const { details: X } = assert;
 
 if (typeof window !== 'undefined') {
   // Let the browser detect when the tests are done.

packages/eventual-send/test/test-hp.js

@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import { HandledPromise } from './get-hp';
 
 test('chained properties', async t => {

packages/eventual-send/test/test-thenable.js

@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import { E, HandledPromise } from './get-hp';
 
 test('E.resolve is always asynchronous', async t => {

packages/import-bundle/package.json

@@ -26,6 +26,7 @@
   "devDependencies": {
     "@agoric/bundle-source": "^1.2.4",
     "@agoric/install-ses": "^0.5.4",
+    "@agoric/swingset-vat": "^0.14.0",
     "ava": "^3.12.1",
     "esm": "^3.2.5",
     "nyc": "^15.1.0"

packages/import-bundle/test/test-compartment-wrapper.js

@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import { assert, details as X } from '@agoric/assert';
 import { wrapInescapableCompartment } from '../src/compartment-wrapper.js';
 

packages/import-manager/package.json

@@ -31,6 +31,7 @@
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "devDependencies": {
     "@agoric/install-ses": "^0.5.4",
+    "@agoric/swingset-vat": "^0.14.0",
     "ava": "^3.12.1",
     "esm": "^3.2.25",
     "nyc": "^15.1.0"

packages/import-manager/test/unitTests/test-importsA.js

@@ -1,7 +1,7 @@
 // Copyright (C) 2019 Agoric, under Apache License 2.0
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
 
-import '@agoric/install-ses';
-import test from 'ava';
 import { makeGoodImportManager } from './goodImports';
 
 test('import num is not empty', t => {

packages/marshal/package.json

@@ -43,6 +43,7 @@
   },
   "devDependencies": {
     "@agoric/install-ses": "^0.5.4",
+    "@agoric/swingset-vat": "^0.14.0",
     "ava": "^3.12.1",
     "esm": "^3.2.25",
     "nyc": "^15.1.0"

packages/marshal/test/test-marshal-justin.js

@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import { makeMarshal, Remotable } from '../src/marshal';
 import { decodeToJustin } from '../src/marshal-justin';
 

packages/marshal/test/test-marshal-stringify.js

@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import { Far } from '../src/marshal';
 import { stringify, parse } from '../src/marshal-stringify';
 import { roundTripPairs } from './test-marshal';

packages/marshal/test/test-marshal.js

@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import {
   Remotable,
   Far,

packages/notifier/package.json

@@ -41,6 +41,7 @@
   },
   "devDependencies": {
     "@agoric/install-ses": "^0.5.4",
+    "@agoric/swingset-vat": "^0.14.0",
     "ava": "^3.12.1",
     "esm": "^3.2.25",
     "nyc": "^15.1.0"

packages/notifier/test/test-notifier-adaptor.js

@@ -1,6 +1,7 @@
 // @ts-check
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import {
   makeAsyncIterableFromNotifier,
   makeNotifierFromAsyncIterable,

packages/registrar/package.json

@@ -34,6 +34,7 @@
   },
   "devDependencies": {
     "@agoric/install-ses": "^0.5.4",
+    "@agoric/swingset-vat": "^0.14.0",
     "ava": "^3.12.1",
     "esm": "^3.2.25",
     "nyc": "^15.1.0"

packages/registrar/test/unitTests/test-registrar.js

@@ -1,5 +1,6 @@
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import { makeRegistrar } from '../../src/registrar';
 
 test('Registrar operations', async t => {

packages/sharing-service/test/swingsetTests/sharingService/test-sharing.js

@@ -1,7 +1,9 @@
 /* global __dirname */
-import '@agoric/install-ses';
-import test from 'ava';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
+
 import path from 'path';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { buildVatController, loadBasedir } from '@agoric/swingset-vat';
 
 async function main(basedir, argv) {