From 96f737e3e42cec42193bf8f5509ff23915dcc789 Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Thu, 3 Oct 2024 06:56:49 -0700
Subject: [PATCH] ci: drop xs:unit job

There are few to no errors we've detected in unit tests running in XS that we didn't in Node. We now have many other tests that run XS and don't need to unit test these. It generally doesn't hurt to test more, but ava-xs is so different from XS that the cost of reconciliation is too great.
---
 .github/workflows/test-all-packages.yml |  1 +
 packages/ERTP/package.json              | 13 +------
 packages/zoe/package.json               | 50 +------------------------
 3 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/test-all-packages.yml b/.github/workflows/test-all-packages.yml
index 2e8d4f8b15d..e56c4590fe7 100644
--- a/.github/workflows/test-all-packages.yml
+++ b/.github/workflows/test-all-packages.yml
@@ -609,6 +609,7 @@ jobs:
       - name: set vars
         id: vars
         # END-TEST-BOILERPLATE
+        # XXX test:xs-unit is deprecated branch protection still expects it
         run: |
           echo "node-version=${{ matrix.engine == 'xs' && '18.x' || matrix.engine }}" >> $GITHUB_OUTPUT
           echo "test=${{ matrix.engine == 'xs' && 'test:xs-unit' || 'test:unit' }}" >> $GITHUB_OUTPUT
diff --git a/packages/ERTP/package.json b/packages/ERTP/package.json
index ca4471e6c7e..fdc347afbf4 100644
--- a/packages/ERTP/package.json
+++ b/packages/ERTP/package.json
@@ -13,8 +13,8 @@
     "postpack": "git clean -f '*.d.ts*' '*.tsbuildinfo'",
     "test": "ava",
     "test:c8": "c8 $C8_OPTIONS ava",
-    "test:xs": "yarn test:xs-unit && yarn test:xs-worker",
-    "test:xs-unit": "ava-xs",
+    "test:xs": "yarn test:xs-worker",
+    "test:xs-unit": "exit 0",
     "test:xs-worker": "SWINGSET_WORKER_TYPE=xs-worker ava -c 2 test/swingsetTests",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
@@ -64,15 +64,6 @@
     "exported.js",
     "exported.d.ts"
   ],
-  "ava-xs": {
-    "exclude": [
-      "swingsetTests",
-      "# fast-check unsupported",
-      "test/unitTests/amountProperties.test.js",
-      "test/unitTests/inputValidation.test.js",
-      "test/unitTests/issuerObj.test.js"
-    ]
-  },
   "ava": {
     "files": [
       "test/**/*.test.*"
diff --git a/packages/zoe/package.json b/packages/zoe/package.json
index 4720134c005..d784b88063d 100644
--- a/packages/zoe/package.json
+++ b/packages/zoe/package.json
@@ -16,8 +16,8 @@
     "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
     "test:unit": "ava 'test/unitTests' -T 1m --verbose",
     "test:swingset": "ava 'test/swingsetTests' -T 10m --verbose",
-    "test:xs": "yarn test:xs-unit",
-    "test:xs-unit": "ava-xs --verbose",
+    "test:xs": "yarn test:xs-worker",
+    "test:xs-unit": "exit 0",
     "test:xs-worker": "SWINGSET_WORKER_TYPE=xs-worker ava -c 2 'test/swingsetTests'",
     "build-zcfBundle": "yarn build:bundles",
     "lint-fix": "yarn lint:eslint --fix",
@@ -85,52 +85,6 @@
     "exported.js",
     "NEWS.md"
   ],
-  "ava-xs": {
-    "exclude": [
-      "# path/url/import.meta stuff",
-      "unitTests/contracts/",
-      "test/swingsetTests/privateArgs/privateArgs.test.js",
-      "test/swingsetTests/brokenContracts/crashingContract.test.js",
-      "test/swingsetTests/offerArgs/offerArgs.test.js",
-      "test/swingsetTests/makeKind/makeKind.test.js",
-      "test/swingsetTests/zoe/zoe.test.js",
-      "test/swingsetTests/runMint/runMint.test.js",
-      "test/unitTests/zoe.test.js",
-      "test/unitTests/scriptedOracle.test.js",
-      "test/unitTests/makeKind.test.js",
-      "test/unitTests/instanceStorage.test.js",
-      "test/unitTests/contractSupport/depositTo.test.js",
-      "test/unitTests/contractSupport/withdrawFrom.test.js",
-      "test/unitTests/contractSupport/offerTo.test.js",
-      "test/unitTests/zcf/zcfSeat.test.js",
-      "test/unitTests/zcf/zcfSeat-exit.test.js",
-      "test/unitTests/zcf/setupZcfTest.js",
-      "test/unitTests/zcf/feeMintAccess.test.js",
-      "# import.meta.url by way of setupZcfTest",
-      "test/unitTests/zoe.test.js",
-      "test/unitTests/zoe-startInstance.test.js",
-      "test/unitTests/blockedOffers.test.js",
-      "test/unitTests/zcf/reallocate-empty.test.js",
-      "test/unitTests/zcf/zoeHelpersWZcf.test.js",
-      "test/unitTests/zcf/reallocateForZCFMint.test.js",
-      "test/unitTests/zcf/atomicRearrange.test.js",
-      "test/unitTests/zcf/zcf.test.js",
-      "test/unitTests/zcf/allStagedSeatsUsed.test.js",
-      "# ManualTimer.setWakeup: no function",
-      "test/unitTests/fakePriceAuthority.test.js",
-      "test/unitTests/manualTimer.test.js",
-      "# hangs",
-      "makeKind.test.js",
-      "test/unitTests/scriptedOracle.test.js",
-      "test/unitTests/zoe.test.js",
-      "test/unitTests/zcf/allStagedSeatsUsed.test.js",
-      "# t.snapshot",
-      "test/exports.test.js",
-      "test/snapshots",
-      "# We use SWINGSET_WORKER_TYPE=xs ava to run these...",
-      "swingsetTests"
-    ]
-  },
   "ava": {
     "files": [
       "test/**/*.test.*"