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

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

Fix git init -b being unavailable for older versions
pull/9391/head
Jordi Boggiano 2020-10-30 18:03:00 +01:00 committed by GitHub
parent 52f98fd228 2ced7b0bf8
commit 28e591dcd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,12 +115,18 @@ class ArchiveManagerTest extends ArchiverTest
chdir($this->testDir);
$output = null;
$result = $this->process->execute('git init -q -b master', $output, $this->testDir);
$result = $this->process->execute('git init -q', $output, $this->testDir);
if ($result > 0) {
chdir($currentWorkDir);
throw new \RuntimeException('Could not init: '.$this->process->getErrorOutput());
}
$result = $this->process->execute('git checkout -b master', $output, $this->testDir);
if ($result > 0) {
chdir($currentWorkDir);
throw new \RuntimeException('Could not checkout master branch: '.$this->process->getErrorOutput());
}
$result = $this->process->execute('git config user.email "you@example.com"', $output, $this->testDir);
if ($result > 0) {
chdir($currentWorkDir);

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

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