Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplified the error check #93

Merged
merged 2 commits into from
Dec 5, 2018
Merged

Simplified the error check #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84f4f02
Simplified the error check.
Dec 3, 2018
636535b
Added missing test.
Dec 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions lib/commands/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const command = {

module.exports = command;

// See: https://github.com/cksource/mgit2/issues/87
// See: #87 and #92.
function isRemoteHungUpError( error ) {
if ( typeof error != 'string' ) {
error = error.toString();
Expand All @@ -102,13 +102,7 @@ function isRemoteHungUpError( error ) {
.filter( message => message.startsWith( 'fatal:' ) )
.map( message => message.trim() );

if ( fatalErrors.length !== 3 ) {
return false;
}

return fatalErrors[ 0 ] == 'fatal: The remote end hung up unexpectedly' &&
fatalErrors[ 1 ] == 'fatal: early EOF' &&
fatalErrors[ 2 ] == 'fatal: index-pack failed';
return fatalErrors[ 0 ] && fatalErrors[ 0 ].match( /fatal: the remote end hung up unexpectedly/i );
}

function delay( ms ) {
Expand Down
48 changes: 47 additions & 1 deletion tests/commands/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ describe( 'commands/bootstrap', () => {
} );
} );

it( 'tries to install missing packages once again if git ends with unexpected error', function() {
it( 'tries to install missing packages once again if git ends with unexpected error (#1)', function() {
this.timeout( 5500 );

stubs.fs.existsSync.returns( false );
Expand Down Expand Up @@ -180,6 +180,52 @@ describe( 'commands/bootstrap', () => {
expect( response.logs.info[ 0 ] ).to.equal( 'Git clone log.' );
} );
} );

it( 'tries to install missing packages once again if git ends with unexpected error (#2)', function() {
this.timeout( 5500 );

stubs.fs.existsSync.returns( false );

stubs.exec.onFirstCall().returns( Promise.reject( [
'exec: Cloning into \'/some/path\'...',
'remote: Enumerating objects: 6, done.',
'remote: Counting objects: 100% (6/6), done.',
'remote: Compressing objects: 100% (6/6), done.',
'packet_write_wait: Connection to 000.00.000.000 port 22: Broken pipe',
'fatal: the remote end hung up unexpectedly',
'fatal: early EOF',
'fatal: index-pack failed'
].join( '\n' ) ) );

stubs.exec.onSecondCall().returns( Promise.resolve( 'Git clone log.' ) );

return bootstrapCommand.execute( data )
.then( response => {
expect( stubs.exec.calledTwice ).to.equal( true );

const firstCommand = stubs.exec.firstCall.args[ 0 ].split( ' && ' );

// Clone the repository for the first time. It failed.
expect( firstCommand[ 0 ] )
.to.equal( 'git clone --progress "git@github.com/organization/test-package.git" "packages/test-package"' );
// Change the directory to cloned package.
expect( firstCommand[ 1 ] ).to.equal( 'cd "packages/test-package"' );
// And check out to proper branch.
expect( firstCommand[ 2 ] ).to.equal( 'git checkout --quiet master' );

const secondCommand = stubs.exec.secondCall.args[ 0 ].split( ' && ' );

// Clone the repository for the second time. It succeed.
expect( secondCommand[ 0 ] )
.to.equal( 'git clone --progress "git@github.com/organization/test-package.git" "packages/test-package"' );
// Change the directory to cloned package.
expect( secondCommand[ 1 ] ).to.equal( 'cd "packages/test-package"' );
// And check out to proper branch.
expect( secondCommand[ 2 ] ).to.equal( 'git checkout --quiet master' );

expect( response.logs.info[ 0 ] ).to.equal( 'Git clone log.' );
} );
} );
} );

describe( 'afterExecute()', () => {
Expand Down