From f77a31c0d62ff280363ca4dbaa2a058f0a970a6f Mon Sep 17 00:00:00 2001
From: Benaka Moorthi <benaka.moorthi@gmail.com>
Date: Wed, 26 Jun 2013 01:48:24 -0700
Subject: [PATCH] Investigating travis build failure... (25th commit)
---
tests/PHPUnit/IntegrationTestCase.php | 2 +-
tests/PHPUnit/config.ini.travis.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index 8a9c431ca5..89cafe1ddd 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -132,7 +132,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
}
Piwik::createDatabase($dbName);
Piwik::disconnectDatabase();
-throw new Exception("DB NAME IS: $dbName");
+
// reconnect once we're sure the database exists
Piwik_Config::getInstance()->database['dbname'] = $dbName;
Piwik::createDatabaseObject();
diff --git a/tests/PHPUnit/config.ini.travis.php b/tests/PHPUnit/config.ini.travis.php
index 54530281bd..07545c6b02 100644
--- a/tests/PHPUnit/config.ini.travis.php
+++ b/tests/PHPUnit/config.ini.travis.php
@@ -11,7 +11,7 @@ email = hello@example.org
host = localhost
username = root
password =
-dbname = piwik_test
+dbname = piwik_tests
adapter = PDO_MYSQL ; PDO_MYSQL, MYSQLI, or PDO_PGSQL
tables_prefix = piwik_
;charset = utf8
--
GitLab