merged branch drak/nativefiletest (PR symfony#5230)

fabpot · fabpot · commit 1c314677d628 · 2012-08-10T12:32:50.000+02:00
Commits ------- fa93324 [HttpFoundation] Fixed test under Windows environment Discussion ---------- [HttpFoundation] Fixed test under Windows environment Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: symfony#5226 Todo: - License of the code: MIT Documentation PR: - --------------------------------------------------------------------------- by travisbot at 2012-08-10T09:54:20Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2084750) (merged fa93324 into dd9afdd).
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
@@ -46,10 +46,9 @@ public function test__ConstructSavePath($savePath, $expectedSavePath, $path)
     {
         $handler = new NativeFileSessionHandler($savePath);
         $this->assertEquals($expectedSavePath, ini_get('session.save_path'));
-        $dir = realpath('/'.$path);
-        $this->assertTrue(is_dir(realpath($dir)));
+        $this->assertTrue(is_dir(realpath($path)));
 
-        rmdir($dir);
+        rmdir($path);
     }
 
     public function savePathDataProvider()

Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,9 @@ public function test__ConstructSavePath($savePath, $expectedSavePath, $path)`
`46`	`46`	`{`
`47`	`47`	`$handler = new NativeFileSessionHandler($savePath);`
`48`	`48`	`$this->assertEquals($expectedSavePath, ini_get('session.save_path'));`
`49`		`- $dir = realpath('/'.$path);`
`50`		`- $this->assertTrue(is_dir(realpath($dir)));`
	`49`	`+ $this->assertTrue(is_dir(realpath($path)));`
`51`	`50`
`52`		`- rmdir($dir);`
	`51`	`+ rmdir($path);`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`public function savePathDataProvider()`