From 86d52c8ff9a9538f017db776d2bf6c313979af32 Mon Sep 17 00:00:00 2001 From: "J. King" Date: Sat, 16 Mar 2019 17:48:48 -0400 Subject: [PATCH] Fix test errors when PostgreSQL or MySQL are not available --- tests/cases/Database/Base.php | 10 ++++++---- tests/cases/DatabaseDrivers/MySQL.php | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/cases/Database/Base.php b/tests/cases/Database/Base.php index 219d4c0..92cf19c 100644 --- a/tests/cases/Database/Base.php +++ b/tests/cases/Database/Base.php @@ -100,10 +100,12 @@ abstract class Base extends \JKingWeb\Arsse\Test\AbstractTest { } public static function tearDownAfterClass() { - // wipe the database absolutely clean - static::dbRaze(static::$drv); - // clean up - static::$drv = null; + if (static::$drv) { + // wipe the database absolutely clean + static::dbRaze(static::$drv); + // clean up + static::$drv = null; + } static::$failureReason = ""; static::clearData(); } diff --git a/tests/cases/DatabaseDrivers/MySQL.php b/tests/cases/DatabaseDrivers/MySQL.php index 27dcb4a..3d14d2e 100644 --- a/tests/cases/DatabaseDrivers/MySQL.php +++ b/tests/cases/DatabaseDrivers/MySQL.php @@ -18,7 +18,7 @@ trait MySQL { protected static $stringOutput = true; public static function dbInterface() { - $d = new \mysqli(Arsse::$conf->dbMySQLHost, Arsse::$conf->dbMySQLUser, Arsse::$conf->dbMySQLPass, Arsse::$conf->dbMySQLDb, Arsse::$conf->dbMySQLPort); + $d = @new \mysqli(Arsse::$conf->dbMySQLHost, Arsse::$conf->dbMySQLUser, Arsse::$conf->dbMySQLPass, Arsse::$conf->dbMySQLDb, Arsse::$conf->dbMySQLPort); if ($d->connect_errno) { return; }