Merge pull request #2607 from Agoric/2605-zoe-xs-tests

test(zoe): disable fewer tests; ava-xs refinements

packages/xsnap/src/ava-xs.js

@@ -1,26 +1,30 @@
 #!/usr/bin/env node
+
+// We use cjs / require style because -r esm doesn't fit on the #! line.
+// https://unix.stackexchange.com/questions/399690/multiple-arguments-in-shebang
+
 /* global require, module */
 // @ts-check
-const esmRequire = require('esm')(module);
+// eslint-disable-next-line no-global-assign
+require = require('esm')(module);
+require('@agoric/install-ses');
 const process = require('process');
 const { spawn } = require('child_process');
 const { type: osType } = require('os');
-const { promises } = require('fs');
+const { promises: fsp } = require('fs');
 const path = require('path');
 const glob = require('glob');
+const bundleSource = require('@agoric/bundle-source').default;
 
-esmRequire('@agoric/install-ses');
-const bundleSource = esmRequire('@agoric/bundle-source').default;
-
-const { main, makeBundleResolve } = esmRequire('./avaXS');
+const { main, makeBundleResolve } = require('./avaXS');
 
 Promise.resolve()
   .then(_ =>
     main(process.argv.slice(2), {
       bundleSource,
       spawn,
       osType,
-      readFile: promises.readFile,
+      readFile: fsp.readFile,
       resolve: makeBundleResolve(path),
       dirname: path.dirname,
       glob,

packages/xsnap/src/avaAssertXS.js

@@ -337,9 +337,9 @@ function test(label, run, htestOpt) {
     const out = tapFormat(htest.send);
     const t = makeTester(htest, out);
     try {
-      out.diagnostic('start', label);
+      // out.diagnostic('start', label);
       await run(t);
-      out.diagnostic('end', label);
+      // out.diagnostic('end', label);
     } catch (ex) {
       console.log('FAIL (todo route console)', ex);
       t.fail(`${label} threw: ${ex.message}`);

packages/xsnap/src/avaXS.js

@@ -50,7 +50,7 @@ const { keys } = Object;
  * @param {string} pattern
  */
 function isMatch(specimen, pattern) {
-  return specimen.match(pattern.replace(/\*/g, '.*'));
+  return specimen.match(`^${pattern.replace(/\*/g, '.*')}$`);
 }
 
 /**

packages/zoe/package.json

@@ -74,23 +74,17 @@
   ],
   "ava-xs": {
     "exclude": [
-      "# eek! SIGSEGV in GC https://github.com/Moddable-OpenSource/moddable/issues/592",
-      "test-loan-e2e.js",
-      "# another SEGV, but not in --debug so I cannot get a stack trace",
-      "contracts/test-callSpread-calculation",
-      "# another SEGV; not investigated",
+      "# F test/unitTests/contracts/loan/test-borrow.js borrow, then addCollateral, then getLiquidationPromise",
+      "# amount value: 100, expected value: 101, message",
       "loan/test-borrow.js",
+      "# https://github.com/Moddable-OpenSource/moddable/issues/604 ",
       "test-fakePriceAuthority.js",
+      "# message: 'isOfferSafe - less than want, less than give threw: get super 32554: no home'",
       "test-offerSafety",
-      "test-scriptedOracle",
-      "test-zoeHelpers",
-      "# multiple instances of automaticRefund for the same Zoe bad plan: 6 still to go",
+      "# F test/unitTests/contracts/test-automaticRefund.js multiple instances of automaticRefund for the same Zoe",
+      "# bad plan: 6 still to go",
       "test-automaticRefund",
-      "test-secondPriceAuction.js",
-      "test-escrowToVote",
       "test-coveredCall",
-      "# offerOk threw: \"instance\" not found: (an object)'",
-      "test-otcDesk.js",
       "# We use WORKER_TYPE=xs ava to run these...",
       "swingsetTests"
     ]