Merge remote-tracking branch 'origin/master'

2013-06-11 15:45:34 +02:00 · 2013-06-11 15:45:34 +02:00 · b6fe46d41e
commit b6fe46d41e
parent 7e95695710 93caaaa129
1 changed files with 1 additions and 1 deletions
--- a/test/Environment_test.php
+++ b/test/Environment_test.php
@ -59,7 +59,7 @@ class Environment_Test extends PHPUnit_Framework_TestCase
            );
        }
        catch (Exception $e) {
-            $this->fail("Error: ".$e->getMessage());
+            $this->markTestSkipped("Error: ".$e->getMessage());
        }

        // Check id MySQL server is 5 version