File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -141,7 +141,7 @@ describe("predefined-variables", () => {
141141 expected += `test-job > ${ key } =${ envVars [ key ] } \n` ;
142142 } ) ;
143143
144- const filteredStdout = writeStreams . stdoutLines . filter ( f => f . startsWith ( "test-job > " ) ) . join ( "\n" ) ;
144+ const filteredStdout = writeStreams . stdoutLines . filter ( f => f . startsWith ( "test-job > " ) && ! f . endsWith ( "> still running..." ) ) . join ( "\n" ) ;
145145 expect ( filteredStdout ) . toEqual ( expected . trim ( ) ) ;
146146 expect ( jobIdSpy ) . toHaveBeenCalledTimes ( 2 ) ;
147147 } ) ;
@@ -178,7 +178,7 @@ CI_SERVER_SHELL_SSH_PORT: 8022
178178 Object . keys ( envVars ) . forEach ( key => {
179179 expected += `test-job > ${ key } =${ envVars [ key ] } \n` ;
180180 } ) ;
181- const filteredStdout = writeStreams . stdoutLines . filter ( f => f . startsWith ( "test-job > " ) ) . join ( "\n" ) ;
181+ const filteredStdout = writeStreams . stdoutLines . filter ( f => f . startsWith ( "test-job > " ) && ! f . endsWith ( "> still running..." ) ) . join ( "\n" ) ;
182182 expect ( filteredStdout ) . toEqual ( expected . trim ( ) ) ;
183183 expect ( jobIdSpy ) . toHaveBeenCalledTimes ( 2 ) ;
184184 } ) ;
@@ -218,7 +218,7 @@ CI_SERVER_SHELL_SSH_PORT: 8022
218218 expected += `test-job > ${ key } =${ envVars [ key ] } \n` ;
219219 } ) ;
220220
221- const filteredStdout = writeStreams . stdoutLines . filter ( f => f . startsWith ( "test-job > " ) ) . join ( "\n" ) ;
221+ const filteredStdout = writeStreams . stdoutLines . filter ( f => f . startsWith ( "test-job > " ) && ! f . endsWith ( "> still running..." ) ) . join ( "\n" ) ;
222222 expect ( filteredStdout ) . toEqual ( expected . trim ( ) ) ;
223223 expect ( jobIdSpy ) . toHaveBeenCalledTimes ( 2 ) ;
224224 } ) ;
Original file line number Diff line number Diff line change @@ -189,7 +189,7 @@ test.concurrent("services <services:entrypoint should support variable expansion
189189 stateDir : ".gitlab-ci-local-entrypoint" ,
190190 } , writeStreams ) ;
191191
192- const filteredStdout = writeStreams . stdoutLines . filter ( f => f . startsWith ( "job1 >" ) ) . join ( "\n" ) ;
192+ const filteredStdout = writeStreams . stdoutLines . filter ( f => f . startsWith ( "job1 >" ) && ! f . endsWith ( "> still running..." ) ) . join ( "\n" ) ;
193193 expect ( filteredStdout ) . toEqual ( `
194194job1 > should support single quote [']
195195job1 > should support double quote ["]
You can’t perform that action at this time.
0 commit comments