File tree Expand file tree Collapse file tree 2 files changed +28
-45
lines changed Expand file tree Collapse file tree 2 files changed +28
-45
lines changed Original file line number Diff line number Diff line change @@ -14,37 +14,29 @@ describe('parseEventStream', function () {
1414 it ( 'should return updated mtimes' , async ( ) => {
1515 const docker = getDocker ( { } ) ;
1616 const streamParser = await parseEventStream ( docker ) ;
17- const data = await new Promise < LayerMtimes > ( function ( resolve , reject ) {
18- let mtimes : LayerMtimes ;
1917
20- return fs
21- . createReadStream ( __dirname + '/fixtures/docker-events.json' )
22- . pipe ( streamParser )
23- . on ( 'error' , reject )
24- . pipe (
25- new Stream . Transform ( {
26- objectMode : true ,
27- transform ( $data : LayerMtimes , _encoding , cb ) {
28- mtimes = $data ;
29- cb ( ) ;
30- } ,
31- } ) ,
32- )
33- . on ( 'end' , ( ) => {
34- resolve ( mtimes ) ;
35- } )
36- . on ( 'error' , reject )
37- . resume ( ) ;
38- } ) ;
39- expect ( data )
18+ let mtimes : LayerMtimes ;
19+ await Stream . promises . pipeline (
20+ fs . createReadStream ( __dirname + '/fixtures/docker-events.json' ) ,
21+ streamParser ,
22+ new Stream . Transform ( {
23+ objectMode : true ,
24+ transform ( $data : LayerMtimes , _encoding , cb ) {
25+ mtimes = $data ;
26+ cb ( ) ;
27+ } ,
28+ } ) . resume ( ) ,
29+ ) ;
30+
31+ expect ( mtimes ! )
4032 . to . have . property ( 'busybox:latest' )
4133 . that . equals ( 1448576072937294800 ) ;
42- expect ( data )
34+ expect ( mtimes ! )
4335 . to . have . property (
4436 'sha256:6d41a4a0bf8168363e29da8a5ecbf3cd6c37e3f5a043decd5e7da6e427ba869c' ,
4537 )
4638 . that . equals ( 1448576073085559800 ) ;
47- expect ( data )
39+ expect ( mtimes ! )
4840 . to . have . property (
4941 'sha256:9a61b6b1315e6b457c31a03346ab94486a2f5397f4a82219bee01eead1c34c2e' ,
5042 )
Original file line number Diff line number Diff line change @@ -11,27 +11,18 @@ import { getDocker } from '../build/docker';
1111const getLayerMtimes = async ( ) => {
1212 const docker = getDocker ( { } ) ;
1313 const streamParser = await parseEventStream ( docker ) ;
14- return await new Promise < LayerMtimes > ( function ( resolve , reject ) {
15- let mtimes : LayerMtimes ;
16- return fs
17- . createReadStream ( __dirname + '/fixtures/docker-events.json' )
18- . pipe ( streamParser )
19- . on ( 'error' , reject )
20- . pipe (
21- new Stream . Transform ( {
22- objectMode : true ,
23- transform ( $data : LayerMtimes , _encoding , cb ) {
24- mtimes = $data ;
25- cb ( ) ;
26- } ,
27- } ) ,
28- )
29- . on ( 'end' , ( ) => {
30- resolve ( mtimes ) ;
31- } )
32- . on ( 'error' , reject )
33- . resume ( ) ;
34- } ) ;
14+ let mtimes : LayerMtimes ;
15+ await Stream . promises . pipeline (
16+ fs . createReadStream ( __dirname + '/fixtures/docker-events.json' ) ,
17+ new Stream . Transform ( {
18+ objectMode : true ,
19+ transform ( $data : LayerMtimes , _encoding , cb ) {
20+ mtimes = $data ;
21+ cb ( ) ;
22+ } ,
23+ } ) . resume ( ) ,
24+ ) ;
25+ return mtimes ! ;
3526} ;
3627
3728describe ( 'createTree' , function ( ) {
You can’t perform that action at this time.
0 commit comments