fix: properly hang when ag-solo start is run

Agoric · May 2, 2021 · b63135f · b63135f
1 parent 16feacd
commit b63135f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/solo/src/start.js b/packages/solo/src/start.js
@@ -385,8 +385,9 @@ export default async function start(basedir, argv) {
   swingSetRunning = true;
   deliverOutbound();
 
+  const afterHellFreezesOver = new Promise(() => {});
   if (!hostport) {
-    return;
+    return afterHellFreezesOver;
   }
 
   const deploys = typeof deploy === 'string' ? [deploy] : deploy;
@@ -410,7 +411,7 @@ export default async function start(basedir, argv) {
   // Launch the agoric wallet deploys (if any).  The assumption is that the CLI
   // runs correctly under the same version of the JS engine we're currently
   // using.
-  fork(
+  const cp = fork(
     agoricCli,
     [
       `deploy`,
@@ -426,4 +427,6 @@ export default async function start(basedir, argv) {
       }
     },
   );
+
+  return afterHellFreezesOver.then(() => cp.kill('SIGINT'));
 }
diff --git a/packages/solo/test/startsolo.sh b/packages/solo/test/startsolo.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 PORT=${PORT-8000}
-AG_SOLO=$(cd ../src && pwd)/entrypoint.cjs
+AG_SOLO=$(cd .. && pwd)/bin/ag-solo
 
 TDIR="${TMPDIR-/tmp}/startsolo.$$"
 trap 'rm -rf "$TDIR"' EXIT