Changes to improve testing (#9608)

* Reorganize trap tests

* Testing db DRIVER to prevent .env from interfering

* New code to detect if Laravel is booted.  Hopefully more reliable.

* WIP external test process

* revert module test helper

* Use .env in Eloquent::boot()

* Fix test database settings loading

* fix undefined classes
(didn't find the one I needed)

* Fix incorrect Config usages
And RrdDefinition return type

* fix .env loading

* use the right DB

* slightly more accurate isConnected

* Move db_name to DBSetupTest specifically

* restore $_SERVER in AuthSSOTest

* missed item

* WIP

* tear down in the correct order.

* some testing cleanups

* remove check for duplicate event listener, it's not working right

* Don't need this change anymore

* Implement Log::event to replace legacy function log_event()

* fix port tests

* fix up tests

* remove pointless TrapTestCase class

* fix style
This commit is contained in:
Tony Murray
2019-03-11 22:59:39 -05:00
committed by GitHub
parent 6a25ed347b
commit d1a0ccda46
43 changed files with 459 additions and 266 deletions

View File

@@ -21,6 +21,7 @@ use Illuminate\Database\QueryException;
use LibreNMS\Config;
use LibreNMS\Exceptions\DatabaseConnectException;
use LibreNMS\DB\Eloquent;
use LibreNMS\Util\Laravel;
function dbIsConnected()
{
@@ -463,11 +464,9 @@ function dbHandleException(QueryException $exception)
}
}
foreach ($exception->getTrace() as $trace) {
$message .= "\n " . $trace['file'] . ':' . $trace['line'];
}
$message .= $exception->getTraceAsString();
if (class_exists('Log')) {
if (Laravel::isBooted()) {
Log::error($message);
} else {
c_echo("%rSQL Error!%n ");