crap

1 files changed, 9 insertions, 6 deletions

diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index 3360f5abb5..d793f4e041 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -110,11 +110,14 @@ Try again.";
     $url = Fixture::getRootUrl() . 'tests/PHPUnit/proxy/index.php?module=TestRunner&action=check';
     $response = Http::sendHttpRequestBy('curl', $url, 2);
 
-    if ($response !== 'OK') {
-        throw new Exception(sprintf(
-            "Piwik should be running at %s but this URL returned an unexpected response: '%s'",
-            Fixture::getRootUrl(),
-            $response
-        ));
+    // The SQL error is for Travis...
+    if ($response === 'OK' || strpos($response, 'Base table or view not found: 1146 Table 'piwik_tests.option' doesn't exist') !== false) {
+        return;
     }
+
+    throw new Exception(sprintf(
+        "Piwik should be running at %s but this URL returned an unexpected response: '%s'",
+        Fixture::getRootUrl(),
+        $response
+    ));
 }