Permalink
Browse files

MINOR #6397 CoreTest should use test specific paths, otherwise confli…

…cts can occur in certain environments (from r115854)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115855 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent 557eb92 commit 17f6f3fbe7505f3561b57d0095f3284f5ba86e53 @halkyon halkyon committed Jan 26, 2011
Showing with 10 additions and 11 deletions.
  1. +10 −11 tests/CoreTest.php
View
@@ -1,5 +1,4 @@
<?php
-
/**
* Tests for the core of sapphire, such as how the temporary
* directory is determined throughout the framework.
@@ -21,26 +20,26 @@ public function testGetTempPathInProject() {
$this->assertEquals(getTempFolder(), $this->tempPath);
} else {
// A typical Windows location for where sites are stored on IIS
- $this->assertEquals(getTempFolder('C:\\inetpub\\wwwroot\\silverstripe'), getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe');
+ $this->assertEquals(getTempFolder('C:\\inetpub\\wwwroot\\silverstripe-test-project'), getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project');
// A typical Mac OS X location for where sites are stored
- $this->assertEquals(getTempFolder('/Users/joebloggs/Sites/silverstripe'), getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe');
-
+ $this->assertEquals(getTempFolder('/Users/joebloggs/Sites/silverstripe-test-project'), getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe-test-project');
+
// A typical Linux location for where sites are stored
- $this->assertEquals(getTempFolder('/var/www/silverstripe'), getSysTempDir() . '/silverstripe-cache-var-www-silverstripe');
+ $this->assertEquals(getTempFolder('/var/www/silverstripe-test-project'), getSysTempDir() . '/silverstripe-cache-var-www-silverstripe-test-project');
}
}
public function tearDown() {
parent::tearDown();
- if(file_exists(getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe')) {
- rmdir(getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe');
+ if(file_exists(getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project')) {
+ rmdir(getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project');
}
- if(file_exists(getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe')) {
- rmdir(getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe');
+ if(file_exists(getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe-test-project')) {
+ rmdir(getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe-test-project');
}
- if(file_exists(getSysTempDir() . '/silverstripe-cache-var-www-silverstripe')) {
- rmdir(getSysTempDir() . '/silverstripe-cache-var-www-silverstripe');
+ if(file_exists(getSysTempDir() . '/silverstripe-cache-var-www-silverstripe-test-project')) {
+ rmdir(getSysTempDir() . '/silverstripe-cache-var-www-silverstripe-test-project');
}
}

0 comments on commit 17f6f3f

Please sign in to comment.