From a19a371ae7f87003dd3ff4ece57ff4a514b2d3fe Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 29 Feb 2016 09:22:53 +0100 Subject: [PATCH 1/4] Remove extra definition Since Symfony 3.0.3 has been released --- src/Wallabag/UserBundle/Resources/config/services.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml index 9a5893320..d79d8fa2b 100644 --- a/src/Wallabag/UserBundle/Resources/config/services.yml +++ b/src/Wallabag/UserBundle/Resources/config/services.yml @@ -1,9 +1,4 @@ services: - # might be fixed in the symfony release - # https://github.com/FriendsOfSymfony/FOSUserBundle/issues/2048 - fos_user.doctrine_registry: - alias: doctrine - wallabag_user.auth_code_mailer: class: Wallabag\UserBundle\Mailer\AuthCodeMailer arguments: From bb0efca468e764af1c0e5f5d29d442fc522854c0 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 29 Feb 2016 09:49:05 +0100 Subject: [PATCH 2/4] Fix postgres database creation Test database was renamed in https://github.com/wallabag/wallabag/pull/1639 but the travis configuration was missed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c6d371a50..db79baabe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ before_script: - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; - composer self-update --no-progress - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; - - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi; + - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; before_install: - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; From dfad9ba0f94562d81b2002b15a5bfd52b9dcba38 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 29 Feb 2016 15:41:26 +0100 Subject: [PATCH 3/4] Defining Github token is now useless We are using it differently with .composer-auth.json file --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index db79baabe..5f0abe871 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,6 @@ before_script: - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; - composer self-update --no-progress - - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; before_install: From 3c39f5ac413cc1bd58a0647fcbb52982af81c078 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 29 Feb 2016 16:22:30 +0100 Subject: [PATCH 4/4] Skipping all Posgres test for wallabag:install We already faced this problem but we are facing it again. https://github.com/wallabag/wallabag/commit/d502762598db68ec822078642df8f6a8214202f7 It seems we can drop a database properly using wallabag:install. The server log keep saying: ERROR: source database "template1" is being accessed by other users DETAIL: There is 1 other session using the database. STATEMENT: CREATE DATABASE "wallabag_test" Which means, it can't remove the database wallabag_test because one other person is using it. --- .../CoreBundle/Command/InstallCommand.php | 2 +- .../Tests/Command/InstallCommandTest.php | 38 +++++++++---------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index 771b3c5a4..e97ba46ad 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -193,7 +193,7 @@ class InstallCommand extends ContainerAwareCommand $this->defaultOutput->writeln('Step 3 of 4. Administration setup.'); $questionHelper = $this->getHelperSet()->get('question'); - $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (y/N)', true); + $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true); if (!$questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) { return $this; diff --git a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php index a79d7b906..bb8fb8888 100644 --- a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php +++ b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php @@ -14,6 +14,24 @@ use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; class InstallCommandTest extends WallabagCoreTestCase { + public function setUp() + { + parent::setUp(); + + 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.'); + } + } + public static function tearDownAfterClass() { $application = new Application(static::$kernel); @@ -91,19 +109,6 @@ class InstallCommandTest extends WallabagCoreTestCase public function testRunInstallCommandWithDatabaseRemoved() { - 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()); @@ -184,13 +189,6 @@ class InstallCommandTest extends WallabagCoreTestCase public function testRunInstallCommandChooseNothing() { - if ($this->getClient()->getContainer()->get('doctrine')->getConnection()->getDriver() instanceof \Doctrine\DBAL\Driver\PDOPgSql\Driver) { - /* - * @see testRunInstallCommandWithDatabaseRemoved - */ - $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());