adjust tests

cdklabs · Dec 30, 2024 · 3b98e84 · 3b98e84
1 parent 35c928d
commit 3b98e84
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lib/private/shell.ts b/lib/private/shell.ts
@@ -54,7 +54,6 @@ export async function shell(command: string[], options: ShellOptions = {}): Prom
     child.once('close', (code, signal) => {
       if (code === 0) {
         const output = Buffer.concat(stdout).toString('utf-8');
-        globalOutputHandler.publishEvent(EventType.SUCCESS, output);
         resolve(output);
       } else {
         const errorOutput = Buffer.concat(stderr).toString('utf-8').trim();
@@ -63,7 +62,6 @@ export async function shell(command: string[], options: ShellOptions = {}): Prom
           signal,
           `${renderCommandLine(command)} exited with ${code != null ? 'error code' : 'signal'} ${code ?? signal}: ${errorOutput}`
         );
-        globalOutputHandler.publishEvent(EventType.FAIL, error.message);
         reject(error);
       }
     });

diff --git a/test/asset-publishing-logs.test.ts b/test/asset-publishing-logs.test.ts
@@ -291,7 +291,7 @@ describe('Shell Command Logging', () => {
     jest.clearAllMocks();
   });
 
-  test('captures both stdout and stderr from shell commands', async () => {
+  test('docker successfully emits publishing events when publishing asset', async () => {
     const messages: string[] = [];
     const aws = new MockAws();
 
@@ -315,12 +315,10 @@ describe('Shell Command Logging', () => {
           '--password-stdin',
           'https://12345.dkr.ecr.region.amazonaws.com',
         ],
-        stdout: 'Login Succeeded',
       },
       {
         commandLine: ['docker', 'inspect', 'cdkasset-thedockerasset'],
         exitCode: 1,
-        stderr: 'Warning: using default credentials\n',
       },
       {
         commandLine: ['docker', 'build', '--tag', 'cdkasset-thedockerasset', '.'],
@@ -345,8 +343,11 @@ describe('Shell Command Logging', () => {
     // Check that both stdout and stderr were captured
     expect(messages).toEqual(
       expect.arrayContaining([
-        expect.stringContaining('Login Succeeded'),
-        expect.stringContaining('Warning: using default credentials'),
+        expect.stringContaining('Publishing theDockerAsset:theDestination'),
+        expect.stringContaining('Check 12345.dkr.ecr.region.amazonaws.com/repo:tag'),
+        expect.stringContaining('Building Docker image at '),
+        expect.stringContaining('Push 12345.dkr.ecr.region.amazonaws.com/repo:tag'),
+        expect.stringContaining('Published theDockerAsset:theDestination'),
       ])
     );
   });