fix: correctly ignore stdin in subprocesses

matter-labs · Aug 29, 2024 · 45fa3a0 · 45fa3a0
1 parent f90064b
commit 45fa3a0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/core/tests/recovery-test/src/index.ts b/core/tests/recovery-test/src/index.ts
@@ -112,7 +112,7 @@ export async function executeCommandWithLogs(command: string, logsPath: string)
     const logs = await fs.open(logsPath, 'w');
     const childProcess = spawn(command, {
         cwd: process.env.ZKSYNC_HOME!!,
-        stdio: [null, logs.fd, logs.fd],
+        stdio: ['ignore', logs.fd, logs.fd],
         shell: true
     });
     try {
@@ -194,7 +194,7 @@ export class NodeProcess {
 
         let childProcess = runExternalNodeInBackground({
             components: [components],
-            stdio: [null, logs.fd, logs.fd],
+            stdio: ['ignore', logs.fd, logs.fd],
             cwd: pathToHome,
             env,
             useZkInception,

diff --git a/core/tests/revert-test/tests/revert-and-restart-en.test.ts b/core/tests/revert-test/tests/revert-and-restart-en.test.ts
@@ -208,7 +208,7 @@ class MainNode {
         }
         let proc = runServerInBackground({
             components: [components],
-            stdio: [null, logs, logs],
+            stdio: ['ignore', logs, logs],
             cwd: pathToHome,
             env: env,
             useZkInception: fileConfig.loadFromFile,
@@ -281,7 +281,7 @@ class ExtNode {
 
         // Run server in background.
         let proc = runExternalNodeInBackground({
-            stdio: [null, logs, logs],
+            stdio: ['ignore', logs, logs],
             cwd: pathToHome,
             env: env,
             useZkInception: fileConfig.loadFromFile,

diff --git a/core/tests/revert-test/tests/revert-and-restart.test.ts b/core/tests/revert-test/tests/revert-and-restart.test.ts
@@ -153,7 +153,7 @@ describe('Block reverting test', function () {
         // Run server in background.
         serverProcess = runServerInBackground({
             components: [components],
-            stdio: [null, logs, logs],
+            stdio: ['ignore', logs, logs],
             cwd: pathToHome,
             useZkInception: fileConfig.loadFromFile,
             chain: fileConfig.chain
@@ -270,7 +270,7 @@ describe('Block reverting test', function () {
         // Run server.
         serverProcess = runServerInBackground({
             components: [components],
-            stdio: [null, logs, logs],
+            stdio: ['ignore', logs, logs],
             cwd: pathToHome,
             useZkInception: fileConfig.loadFromFile,
             chain: fileConfig.chain
@@ -321,7 +321,7 @@ describe('Block reverting test', function () {
         // Run again.
         serverProcess = runServerInBackground({
             components: [components],
-            stdio: [null, logs, logs],
+            stdio: ['ignore', logs, logs],
             cwd: pathToHome,
             useZkInception: fileConfig.loadFromFile,
             chain: fileConfig.chain

diff --git a/core/tests/upgrade-test/tests/upgrade.test.ts b/core/tests/upgrade-test/tests/upgrade.test.ts
@@ -138,7 +138,7 @@ describe('Upgrade test', function () {
         // Run server in background.
         runServerInBackground({
             components: serverComponents,
-            stdio: [null, logs, logs],
+            stdio: ['ignore', logs, logs],
             cwd: pathToHome,
             useZkInception: fileConfig.loadFromFile,
             chain: fileConfig.chain
@@ -346,7 +346,7 @@ describe('Upgrade test', function () {
         // Run again.
         runServerInBackground({
             components: serverComponents,
-            stdio: [null, logs, logs],
+            stdio: ['ignore', logs, logs],
             cwd: pathToHome,
             useZkInception: fileConfig.loadFromFile,
             chain: fileConfig.chain