Merge branch 'main' of github.com:mongodb-js/mongosh into gagik/e2e-foliage

Author: gagik

THIRD_PARTY_NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **mongosh**.
-This document was automatically generated on Sun Dec 15 2024.
+This document was automatically generated on Mon Dec 16 2024.
 
 ## List of dependencies
 

packages/e2e-tests/test/e2e-auth.spec.ts

@@ -998,7 +998,7 @@ describe('Auth e2e', function () {
             ],
           });
           if (
-            (await preTestShell.waitForExit()) === 1 &&
+            (await preTestShell.waitForAnyExit()) === 1 &&
             preTestShell.output.match(
               /digital envelope routines::unsupported|SSL routines::library has no ciphers/
             )
@@ -1022,7 +1022,7 @@ describe('Auth e2e', function () {
             'SCRAM-SHA-1',
           ],
         });
-        await shell.waitForExit();
+        await shell.waitForAnyExit();
         try {
           shell.assertContainsOutput(
             'Auth mechanism SCRAM-SHA-1 is not supported in FIPS mode'
@@ -1109,7 +1109,7 @@ describe('Auth e2e', function () {
             'GSSAPI',
           ],
         });
-        await shell.waitForExit();
+        await shell.waitForAnyExit();
         // Failing to auth with kerberos fails with different error messages on each OS.
         // Sometimes in CI, it also fails because the server received kerberos
         // credentials, most likely because of a successful login by another

packages/e2e-tests/test/e2e-direct.spec.ts

@@ -344,7 +344,7 @@ describe('e2e direct connection', function () {
           const shell = this.startTestShell({
             args: ['--host', hostlist, 'admin'],
           });
-          await shell.waitForExit();
+          await shell.waitForAnyExit();
           shell.assertContainsOutput('MongoServerSelectionError');
         });
 

packages/e2e-tests/test/e2e-oidc.spec.ts

@@ -249,7 +249,7 @@ describe('OIDC auth e2e', function () {
         '--browser=false',
       ],
     });
-    await shell.waitForExit();
+    await shell.waitForAnyExit();
     shell.assertContainsOutput(
       'Consider specifying --oidcFlows=auth-code,device-auth if you are running mongosh in an environment without browser access'
     );
@@ -405,7 +405,7 @@ describe('OIDC auth e2e', function () {
         MONGOSH_E2E_TEST_CURL_ALLOW_INVALID_TLS: '1',
       },
     });
-    await shell.waitForExit();
+    await shell.waitForAnyExit();
     // We cannot make the mongod server accept the mock IdP's certificate,
     // so the best we can verify here is that auth failed *on the server*
     shell.assertContainsOutput(/MongoServerError: Authentication failed/);
@@ -435,7 +435,7 @@ describe('OIDC auth e2e', function () {
       },
     });
 
-    await shell.waitForExit();
+    await shell.waitForAnyExit();
     // We cannot make the mongod server accept the mock IdP's certificate,
     // so the best we can verify here is that auth failed *on the server*
     shell.assertContainsOutput(/MongoServerError: Authentication failed/);
@@ -499,7 +499,7 @@ describe('OIDC auth e2e', function () {
         '--eval=42',
       ],
     });
-    await shell.waitForExit();
+    await shell.waitForSuccessfulExit();
 
     shell.assertContainsOutput('BEGIN OIDC TOKEN DUMP');
     shell.assertContainsOutput('"tokenType": "Bearer"');
@@ -519,7 +519,7 @@ describe('OIDC auth e2e', function () {
         '--eval=42',
       ],
     });
-    await shell.waitForExit();
+    await shell.waitForSuccessfulExit();
 
     shell.assertContainsOutput('BEGIN OIDC TOKEN DUMP');
     shell.assertContainsOutput('"tokenType": "Bearer"');

packages/e2e-tests/test/e2e-proxy.spec.ts

@@ -271,7 +271,7 @@ describe('e2e proxy support', function () {
       },
     });
 
-    const code = await shell.waitForExit();
+    const code = await shell.waitForAnyExit();
     expect(code).to.equal(1);
   });
 
@@ -622,7 +622,7 @@ describe('e2e proxy support', function () {
         },
       });
 
-      await shell.waitForExit();
+      await shell.waitForAnyExit();
       // We cannot make the mongod server accept the mock IdP's certificate,
       // so the best we can verify here is that auth failed *on the server*
       shell.assertContainsOutput(/MongoServerError: Authentication failed/);

packages/e2e-tests/test/e2e-snippet.spec.ts

@@ -87,7 +87,7 @@ describe('snippet integration tests', function () {
       'config.set("snippetIndexSourceURLs", "http://localhost:1/")'
     );
     shell.writeInputLine('exit');
-    await shell.waitForExit();
+    await shell.waitForSuccessfulExit();
 
     shell = makeTestShell();
     await shell.waitForPrompt();

packages/e2e-tests/test/e2e-tls.spec.ts

@@ -92,8 +92,8 @@ describe('e2e TLS', function () {
         });
         await shell.waitForPrompt();
         await shell.executeLine('db.shutdownServer({ force: true })');
-        shell.kill();
-        await shell.waitForExit();
+        shell.writeInputLine('exit');
+        await shell.waitForAnyExit(); // closing the server may lead to an error being displayed
       });
 
       const server = startTestServer('e2e-tls-no-cli-valid-srv', {
@@ -399,8 +399,8 @@ describe('e2e TLS', function () {
       });
       await shell.waitForPrompt();
       await shell.executeLine('db.shutdownServer({ force: true })');
-      shell.kill();
-      await shell.waitForExit();
+      shell.writeInputLine('exit');
+      await shell.waitForAnyExit(); // closing the server may lead to an error being displayed
     });
 
     const server = startTestServer('e2e-tls-valid-cli-valid-srv', {