Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2015-01-14 07:28:26 +0300
committermattab <matthieu.aubry@gmail.com>2015-01-14 07:28:26 +0300
commit15321e928b34c9fd6fdf392255412928a1f317c4 (patch)
treed011dc405473e67f14ac51a2f2c203355b650527 /tests/PHPUnit/bootstrap.php
parent3d5374b11a70916cea014e518f57518f065f9ada (diff)
When database is not created yet, prevent fails from testing locally
Diffstat (limited to 'tests/PHPUnit/bootstrap.php')
-rw-r--r--tests/PHPUnit/bootstrap.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index e067ef11c3..b37816e231 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -113,8 +113,12 @@ Try again.";
$url = Fixture::getRootUrl() . 'tests/PHPUnit/proxy/index.php?module=TestRunner&action=check';
$response = Http::sendHttpRequestBy('curl', $url, 2);
- // The SQL error is for Travis...
- if ($response === 'OK' || strpos($response, 'Table &#039;piwik_tests.option&#039; doesn&#039;t exist') !== false) {
+ if ($response === 'OK'
+ // The SQL error is for Travis...
+ || strpos($response, 'Table &#039;piwik_tests.option&#039; doesn&#039;t exist') !== false
+ || strpos($response, 'Table &#039;piwik_tests.piwiktests_option&#039; doesn&#039;t exist') !== false
+ ) {
+
return;
}