1
0
Fork 0

use a proper tmp directory

this test failed on OSX before, trying to create a directory at the root of the filesystem
pull/4834/head
Rob Bast 2016-01-26 14:32:04 +01:00
parent f1fd7d1dd6
commit f829a160fb
2 changed files with 31 additions and 4 deletions

View File

@ -294,7 +294,7 @@ EOT
// handler Ctrl+C for unix-like systems // handler Ctrl+C for unix-like systems
if (function_exists('pcntl_signal')) { if (function_exists('pcntl_signal')) {
declare (ticks = 100); declare(ticks=100);
pcntl_signal(SIGINT, function () use ($directory) { pcntl_signal(SIGINT, function () use ($directory) {
$fs = new Filesystem(); $fs = new Filesystem();
$fs->removeDirectory($directory); $fs->removeDirectory($directory);

View File

@ -13,22 +13,49 @@
namespace Composer\Repository; namespace Composer\Repository;
use Composer\TestCase; use Composer\TestCase;
use Composer\Util\Filesystem;
class RepositoryManagerTest extends TestCase class RepositoryManagerTest extends TestCase
{ {
protected $tmpdir;
public function setUp()
{
$this->tmpdir = $this->getUniqueTmpDirectory();
}
public function tearDown()
{
if (is_dir($this->tmpdir)) {
$fs = new Filesystem();
$fs->removeDirectory($this->tmpdir);
}
}
/** /**
* @dataProvider creationCases * @dataProvider creationCases
*/ */
public function testRepoCreation($type, $config, $exception = null) public function testRepoCreation($type, $options, $exception = null)
{ {
if ($exception) { if ($exception) {
$this->setExpectedException($exception); $this->setExpectedException($exception);
} }
$rm = new RepositoryManager( $rm = new RepositoryManager(
$this->getMock('Composer\IO\IOInterface'), $this->getMock('Composer\IO\IOInterface'),
$this->getMock('Composer\Config'), $config = $this->getMock('Composer\Config', array('get')),
$this->getMockBuilder('Composer\EventDispatcher\EventDispatcher')->disableOriginalConstructor()->getMock() $this->getMockBuilder('Composer\EventDispatcher\EventDispatcher')->disableOriginalConstructor()->getMock()
); );
$tmpdir = $this->tmpdir;
$config
->expects($this->any())
->method('get')
->will($this->returnCallback(function ($arg) use ($tmpdir) {
return 'cache-repo-dir' === $arg ? $tmpdir : null;
}))
;
$rm->setRepositoryClass('composer', 'Composer\Repository\ComposerRepository'); $rm->setRepositoryClass('composer', 'Composer\Repository\ComposerRepository');
$rm->setRepositoryClass('vcs', 'Composer\Repository\VcsRepository'); $rm->setRepositoryClass('vcs', 'Composer\Repository\VcsRepository');
$rm->setRepositoryClass('package', 'Composer\Repository\PackageRepository'); $rm->setRepositoryClass('package', 'Composer\Repository\PackageRepository');
@ -40,7 +67,7 @@ class RepositoryManagerTest extends TestCase
$rm->setRepositoryClass('artifact', 'Composer\Repository\ArtifactRepository'); $rm->setRepositoryClass('artifact', 'Composer\Repository\ArtifactRepository');
$rm->createRepository('composer', array('url' => 'http://example.org')); $rm->createRepository('composer', array('url' => 'http://example.org'));
$rm->createRepository($type, $config); $rm->createRepository($type, $options);
} }
public function creationCases() public function creationCases()