public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #9378 from studioromeo/fix-git-non-master-default-failing-tests 

Fix running tests with non standard default branch
pull/9384/head
Jordi Boggiano 2020-10-30 10:35:13 +01:00 committed by GitHub
parent 34bdc6cbf2 e6c7ab693e
commit 097ef425f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php
View File

@ -115,7 +115,7 @@ class ArchiveManagerTest extends ArchiverTest
chdir($this->testDir); chdir($this->testDir);
$output = null; $output = null;
$result = $this->process->execute('git init -q', $output, $this->testDir); $result = $this->process->execute('git init -q -b master', $output, $this->testDir);
if ($result > 0) { if ($result > 0) {
chdir($currentWorkDir); chdir($currentWorkDir);
throw new \RuntimeException('Could not init: '.$this->process->getErrorOutput()); throw new \RuntimeException('Could not init: '.$this->process->getErrorOutput());

2
tests/Composer/Test/Repository/VcsRepositoryTest.php
View File

@ -58,7 +58,7 @@ class VcsRepositoryTest extends TestCase
} }
}; };
$exec('git init'); $exec('git init -q -b master');
$exec('git config user.email composertest@example.org'); $exec('git config user.email composertest@example.org');
$exec('git config user.name ComposerTest'); $exec('git config user.name ComposerTest');
$exec('git config commit.gpgsign false'); $exec('git config commit.gpgsign false');