Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2026-05-06 11:16:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Randomize temp-dir and ignore IOException in tests

Browse Source 
If the file pointer is not closed or some other program (like TGitcache.exe) is reading the file
the tests don't fail anymore.
This commit is contained in:
Sebastiaan Stok
2012-08-31 11:36:30 +02:00
parent 75a00574b5
commit 19feb0d87e
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/ClientTest.php
View File

@@ -8,15 +8,13 @@ use Symfony\Component\Filesystem\Filesystem;
class ClientTest extends PHPUnit_Framework_TestCase
{
protected static $tmpdir = '/tmp/gitlist';
protected static $tmpdir;
protected $client;
public static function setUpBeforeClass()
{
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
self::$tmpdir = getenv('TMP').'/gitlist';
}
self::$tmpdir = str_replace('\\', '/', getenv('TMP') .'/gitlist_' . md5(time() . mt_rand()));
$fs = new Filesystem();
$fs->mkdir(self::$tmpdir);
@@ -58,7 +56,7 @@ class ClientTest extends PHPUnit_Framework_TestCase
*/
public function testIsNotAbleToGetUnexistingRepositories()
{
$this->client->getRepositories('/tmp');
$this->client->getRepositories(self::$tmpdir);
}
public function testIsCreatingRepository()
@@ -117,6 +115,11 @@ class ClientTest extends PHPUnit_Framework_TestCase
public static function tearDownAfterClass()
{
$fs = new Filesystem();
$fs->remove(self::$tmpdir);
try {
//$fs->remove(self::$tmpdir);
} catch (IOException $e) {
// Ignore, file is not closed yet
}
}
}

14
tests/InterfaceTest.php
View File

@@ -4,17 +4,16 @@ require 'vendor/autoload.php';
use Silex\WebTestCase;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Filesystem\Exception\IOException;
use GitList\Component\Git\Client;
class InterfaceTest extends WebTestCase
{
protected static $tmpdir = '/tmp/gitlist';
protected static $tmpdir;
public static function setUpBeforeClass()
{
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
self::$tmpdir = getenv('TMP').'/gitlist';
}
self::$tmpdir = getenv('TMP').'/gitlist_' . md5(time() . mt_rand()) . '/';
$fs = new Filesystem();
$fs->mkdir(self::$tmpdir);
@@ -197,6 +196,11 @@ class InterfaceTest extends WebTestCase
public static function tearDownAfterClass()
{
$fs = new Filesystem();
$fs->remove(self::$tmpdir);
try {
$fs->remove(self::$tmpdir);
} catch (IOException $e) {
// Ignore, file is not closed yet
}
}
}

19
tests/RepositoryTest.php
View File

@@ -14,9 +14,7 @@ class RepositoryTest extends PHPUnit_Framework_TestCase
public static function setUpBeforeClass()
{
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
self::$tmpdir = getenv('TMP').'/gitlist';
}
self::$tmpdir = getenv('TMP').'/gitlist_' . md5(time() . mt_rand()) . '/';
$fs = new Filesystem();
$fs->mkdir(self::$tmpdir);
@@ -332,6 +330,10 @@ class RepositoryTest extends PHPUnit_Framework_TestCase
public function testIsGettingSymlinksWithinTrees()
{
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$this->markTestSkipped('Unable to run on Windows');
}
$repository = $this->client->getRepository(self::$tmpdir . '/testrepo');
$fs = new Filesystem();
$fs->touch(self::$tmpdir . '/testrepo/original_file.txt');
@@ -354,6 +356,10 @@ class RepositoryTest extends PHPUnit_Framework_TestCase
public function testIsGettingSymlinksWithinTreesOutput()
{
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$this->markTestSkipped('Unable to run on Windows');
}
$repository = $this->client->getRepository(self::$tmpdir . '/testrepo');
$fs = new Filesystem();
$fs->touch(self::$tmpdir . '/testrepo/original_file.txt');
@@ -377,6 +383,11 @@ class RepositoryTest extends PHPUnit_Framework_TestCase
public static function tearDownAfterClass()
{
$fs = new Filesystem();
$fs->remove(self::$tmpdir);
try {
$fs->remove(self::$tmpdir);
} catch (\Exception $e) {
// Ignore, file is not closed yet
}
}
}