Merge remote branch 'pborreli/windows-fix-test'

* pborreli/windows-fix-test: [Sismo][Windows] Fixed tests [Sismo] Better exception for failing Process
ygauthier · Apr 12, 2011 · 0416b0f · 0416b0f
2 parents 7595237 + e9af0ea
commit 0416b0f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/Sismo/Storage.php b/src/Sismo/Storage.php
@@ -144,4 +144,14 @@ private function createCommit($project, $result)
 
         return $commit;
     }
+
+    public function close()
+    {
+        $this->db->close();
+    }
+
+    public function __destruct()
+    {
+        $this->close();
+    }
 }
diff --git a/tests/appTest.php b/tests/appTest.php
@@ -21,7 +21,7 @@ public function createApp()
     {
         $app = require __DIR__.'/../src/bootstrap.php';
 
-        $this->baseDir = sys_get_temp_dir().'/sismo';
+        $this->baseDir = realpath(sys_get_temp_dir()).'/sismo';
         $fs = new Filesystem();
         $fs->mkdir($this->baseDir);
         $fs->mkdir($this->baseDir.'/config');
@@ -40,6 +40,8 @@ public function tearDown()
     {
         parent::tearDown();
 
+        $this->app['storage']->close();
+
         $fs = new Filesystem();
         $fs->remove($this->baseDir);
     }

diff --git a/tests/bootstrapTest.php b/tests/bootstrapTest.php
@@ -34,6 +34,8 @@ public function tearDown()
     {
         parent::tearDown();
 
+        $this->app['storage']->close();
+
         $fs = new Filesystem();
         $fs->remove($this->baseDir);
     }

diff --git a/tests/consoleTest.php b/tests/consoleTest.php
@@ -63,7 +63,7 @@ public function testBuildForProjects()
         $tester = new ApplicationTester($this->console);
 
         $this->assertEquals(0, $tester->run(array('command' => 'build')));
-        $this->assertEquals("Building Project \"Twig\" (into \"d41d8c\")\n\nBuilding Project \"Silex\" (into \"d41d8c\")", trim($tester->getDisplay()));
+        $this->assertEquals('Building Project "Twig" (into "d41d8c")'.PHP_EOL.PHP_EOL.'Building Project "Silex" (into "d41d8c")', trim($tester->getDisplay()));
     }
 
     public function testVerboseBuildForProject()