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

Make SvnDriverTest and XzDownloaderTest more portable on Windows

pull/10343/head
Jordi Boggiano 2021-12-31 17:08:31 +01:00
parent ccd87c479c
commit a4a2b6da87
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/Composer/Test/Downloader/XzDownloaderTest.php
View File

@ -41,6 +41,9 @@ class XzDownloaderTest extends TestCase
protected function tearDown(): void protected function tearDown(): void
{ {
if (Platform::isWindows()) {
return;
}
parent::tearDown(); parent::tearDown();
$this->fs = new Filesystem; $this->fs = new Filesystem;
$this->fs->removeDirectory($this->testDir); $this->fs->removeDirectory($this->testDir);

19
tests/Composer/Test/Repository/Vcs/SvnDriverTest.php
View File

@ -17,6 +17,7 @@ use Composer\Config;
use Composer\Test\TestCase; use Composer\Test\TestCase;
use Composer\Util\Filesystem; use Composer\Util\Filesystem;
use Composer\Test\Mock\ProcessExecutorMock; use Composer\Test\Mock\ProcessExecutorMock;
use Composer\Util\ProcessExecutor;
class SvnDriverTest extends TestCase class SvnDriverTest extends TestCase
{ {
@ -60,13 +61,19 @@ class SvnDriverTest extends TestCase
$output .= " rejected Basic challenge (https://corp.svn.local/)"; $output .= " rejected Basic challenge (https://corp.svn.local/)";
$process = $this->getProcessExecutorMock(); $process = $this->getProcessExecutorMock();
$authedCommand = sprintf(
'svn ls --verbose --non-interactive --username %s --password %s -- %s',
ProcessExecutor::escape('till'),
ProcessExecutor::escape('secret'),
ProcessExecutor::escape('https://till:secret@corp.svn.local/repo/trunk')
);
$process->expects(array( $process->expects(array(
array('cmd' => "svn ls --verbose --non-interactive --username 'till' --password 'secret' -- 'https://till:secret@corp.svn.local/repo/trunk'", 'return' => 1, 'stderr' => $output), array('cmd' => $authedCommand, 'return' => 1, 'stderr' => $output),
array('cmd' => "svn ls --verbose --non-interactive --username 'till' --password 'secret' -- 'https://till:secret@corp.svn.local/repo/trunk'", 'return' => 1, 'stderr' => $output), array('cmd' => $authedCommand, 'return' => 1, 'stderr' => $output),
array('cmd' => "svn ls --verbose --non-interactive --username 'till' --password 'secret' -- 'https://till:secret@corp.svn.local/repo/trunk'", 'return' => 1, 'stderr' => $output), array('cmd' => $authedCommand, 'return' => 1, 'stderr' => $output),
array('cmd' => "svn ls --verbose --non-interactive --username 'till' --password 'secret' -- 'https://till:secret@corp.svn.local/repo/trunk'", 'return' => 1, 'stderr' => $output), array('cmd' => $authedCommand, 'return' => 1, 'stderr' => $output),
array('cmd' => "svn ls --verbose --non-interactive --username 'till' --password 'secret' -- 'https://till:secret@corp.svn.local/repo/trunk'", 'return' => 1, 'stderr' => $output), array('cmd' => $authedCommand, 'return' => 1, 'stderr' => $output),
array('cmd' => "svn ls --verbose --non-interactive --username 'till' --password 'secret' -- 'https://till:secret@corp.svn.local/repo/trunk'", 'return' => 1, 'stderr' => $output), array('cmd' => $authedCommand, 'return' => 1, 'stderr' => $output),
array('cmd' => 'svn --version', 'return' => 0, 'stdout' => '1.2.3'), array('cmd' => 'svn --version', 'return' => 0, 'stdout' => '1.2.3'),
), true); ), true);