3 files changed, 48 insertions, 30 deletions

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 8b702c95..85c4ee90 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -111,14 +111,17 @@ class InstallCommand extends ContainerAwareCommand
 
         // user want to reset everything? Don't care about what is already here
         if (true === $this->defaultInput->getOption('reset')) {
-            $this->defaultOutput->writeln('Droping database, creating database and schema');
+            $this->defaultOutput->writeln('Droping database, creating database and schema, clearing the cache');
 
             $this
                 ->runCommand('doctrine:database:drop', array('--force' => true))
                 ->runCommand('doctrine:database:create')
                 ->runCommand('doctrine:schema:create')
+                ->runCommand('cache:clear')
             ;
 
+            $this->defaultOutput->writeln('');
+
             return $this;
         }
 
@@ -131,6 +134,8 @@ class InstallCommand extends ContainerAwareCommand
                 ->runCommand('cache:clear')
             ;
 
+            $this->defaultOutput->writeln('');
+
             return $this;
         }
 
diff --git a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
index e98dd202..e3ff47c0 100644
--- a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
@@ -28,9 +28,7 @@ class InstallCommandTest extends WallabagCoreTestCase
 
     public function testRunInstallCommand()
     {
-        $this->container = static::$kernel->getContainer();
-
-        $application = new Application(static::$kernel);
+        $application = new Application($this->getClient()->getKernel());
         $application->add(new InstallCommandMock());
 
         $command = $application->find('wallabag:install');
@@ -59,9 +57,7 @@ class InstallCommandTest extends WallabagCoreTestCase
 
     public function testRunInstallCommandWithReset()
     {
-        $this->container = static::$kernel->getContainer();
-
-        $application = new Application(static::$kernel);
+        $application = new Application($this->getClient()->getKernel());
         $application->add(new InstallCommandMock());
 
         $command = $application->find('wallabag:install');
@@ -89,28 +85,39 @@ class InstallCommandTest extends WallabagCoreTestCase
         $this->assertContains('Step 4 of 4. Installing assets.', $tester->getDisplay());
 
         // we force to reset everything
-        $this->assertContains('Droping database, creating database and schema', $tester->getDisplay());
+        $this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay());
     }
 
-    /**
-     * @group command-doctrine
-     */
     public function testRunInstallCommandWithDatabaseRemoved()
     {
-        $this->container = static::$kernel->getContainer();
-
-        $application = new Application(static::$kernel);
-        $application->add(new InstallCommand());
+        if ($this->getClient()->getContainer()->get('doctrine')->getConnection()->getDriver() instanceOf \Doctrine\DBAL\Driver\PDOPgSql\Driver) {
+            /**
+             * LOG:  statement: CREATE DATABASE "wallabag"
+             * ERROR:  source database "template1" is being accessed by other users
+             * DETAIL:  There is 1 other session using the database.
+             * STATEMENT:  CREATE DATABASE "wallabag"
+             * FATAL:  database "wallabag" does not exist
+             *
+             * http://stackoverflow.com/a/14374832/569101
+             */
+            $this->markTestSkipped('PostgreSQL spotted: can find a good way to drop current database, skipping.');
+        }
+
+        $application = new Application($this->getClient()->getKernel());
         $application->add(new DropDatabaseDoctrineCommand());
 
         // drop database first, so the install command won't ask to reset things
-        $command = new DropDatabaseDoctrineCommand();
-        $command->setApplication($application);
+        $command = $application->find('doctrine:database:drop');
         $command->run(new ArrayInput(array(
             'command' => 'doctrine:database:drop',
             '--force' => true,
         )), new NullOutput());
 
+        // start a new application to avoid lagging connexion to pgsql
+        $client = static::createClient();
+        $application = new Application($client->getKernel());
+        $application->add(new InstallCommand());
+
         $command = $application->find('wallabag:install');
 
         // We mock the QuestionHelper
@@ -140,9 +147,7 @@ class InstallCommandTest extends WallabagCoreTestCase
 
     public function testRunInstallCommandChooseResetSchema()
     {
-        $this->container = static::$kernel->getContainer();
-
-        $application = new Application(static::$kernel);
+        $application = new Application($this->getClient()->getKernel());
         $application->add(new InstallCommandMock());
 
         $command = $application->find('wallabag:install');
@@ -176,14 +181,22 @@ class InstallCommandTest extends WallabagCoreTestCase
         $this->assertContains('Droping schema and creating schema', $tester->getDisplay());
     }
 
-    /**
-     * @group command-doctrine
-     */
     public function testRunInstallCommandChooseNothing()
     {
-        $this->container = static::$kernel->getContainer();
-
-        $application = new Application(static::$kernel);
+        if ($this->getClient()->getContainer()->get('doctrine')->getConnection()->getDriver() instanceOf \Doctrine\DBAL\Driver\PDOPgSql\Driver) {
+            /**
+             * LOG:  statement: CREATE DATABASE "wallabag"
+             * ERROR:  source database "template1" is being accessed by other users
+             * DETAIL:  There is 1 other session using the database.
+             * STATEMENT:  CREATE DATABASE "wallabag"
+             * FATAL:  database "wallabag" does not exist
+             *
+             * http://stackoverflow.com/a/14374832/569101
+             */
+            $this->markTestSkipped('PostgreSQL spotted: can find a good way to drop current database, skipping.');
+        }
+
+        $application = new Application($this->getClient()->getKernel());
         $application->add(new InstallCommand());
         $application->add(new DropDatabaseDoctrineCommand());
         $application->add(new CreateDatabaseDoctrineCommand());
@@ -196,7 +209,7 @@ class InstallCommandTest extends WallabagCoreTestCase
             '--force' => true,
         )), new NullOutput());
 
-        $this->container->get('doctrine')->getManager()->getConnection()->close();
+        $this->getClient()->getContainer()->get('doctrine')->getConnection()->close();
 
         $command = new CreateDatabaseDoctrineCommand();
         $command->setApplication($application);
@@ -237,9 +250,7 @@ class InstallCommandTest extends WallabagCoreTestCase
 
     public function testRunInstallCommandNoInteraction()
     {
-        $this->container = static::$kernel->getContainer();
-
-        $application = new Application(static::$kernel);
+        $application = new Application($this->getClient()->getKernel());
         $application->add(new InstallCommandMock());
 
         $command = $application->find('wallabag:install');
diff --git a/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php b/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php
index e5096528..ce3cabe8 100644
--- a/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php
+++ b/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php
@@ -15,6 +15,8 @@ abstract class WallabagCoreTestCase extends WebTestCase
 
     public function setUp()
     {
+        parent::setUp();
+
         $this->client = static::createClient();
     }