mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Slightly better OS module test output (#15001)

Browse Source 
* Slightly better OS module test output
Maybe faster
Remove forced --debug in phpunit

* No assertions is ok

* Use always true assert instead

* Restore route poller module skip

* Sneaky whitespace
This commit is contained in:
Tony Murray
2023-04-27 14:49:52 -05:00
committed by GitHub
parent b0998b99a4
commit 75f8fe214f
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LibreNMS/Util/CiHelper.php
View File

@@ -178,7 +178,7 @@ class CiHelper
*/
public function checkUnit()
{
$phpunit_cmd = [$this->checkPhpExec('phpunit'), '--colors=always', '--debug'];
$phpunit_cmd = [$this->checkPhpExec('phpunit'), '--colors=always'];
if ($this->flags['fail-fast']) {
array_push($phpunit_cmd, '--stop-on-error', '--stop-on-failure');

40
tests/OSModulesTest.php
View File

@@ -27,6 +27,7 @@ namespace LibreNMS\Tests;
use DeviceCache;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Arr;
use LibreNMS\Config;
use LibreNMS\Data\Source\Fping;
use LibreNMS\Data\Source\FpingResponse;
@@ -34,6 +35,7 @@ use LibreNMS\Exceptions\FileNotFoundException;
use LibreNMS\Exceptions\InvalidModuleException;
use LibreNMS\Util\Debug;
use LibreNMS\Util\ModuleTestHelper;
use PHPUnit\Util\Color;
class OSModulesTest extends DBTestCase
{
@@ -118,36 +120,22 @@ class OSModulesTest extends DBTestCase
foreach ($modules as $module) {
$expected = $expected_data[$module]['discovery'] ?? [];
$actual = $results[$module]['discovery'] ?? [];
$this->assertEquals(
$expected,
$actual,
"OS $os: Discovered $module data does not match that found in $filename\n"
. print_r(array_diff($expected, $actual), true)
. $helper->getDiscoveryOutput($phpunit_debug ? null : $module)
. "\nOS $os: Discovered $module data does not match that found in $filename"
);
$this->checkTestData($expected, $actual, 'Discovered', $os, $module, $filename, $helper, $phpunit_debug);
if ($module === 'route') {
// no route poller module
continue;
}
if ($expected_data[$module]['poller'] == 'matches discovery') {
$expected = $expected_data[$module]['discovery'];
} else {
if ($expected_data[$module]['poller'] !== 'matches discovery') {
$expected = $expected_data[$module]['poller'] ?? [];
}
$actual = $results[$module]['poller'] ?? [];
$this->assertEquals(
$expected,
$actual,
"OS $os: Polled $module data does not match that found in $filename\n"
. print_r(array_diff($expected, $actual), true)
. $helper->getPollerOutput($phpunit_debug ? null : $module)
. "\nOS $os: Polled $module data does not match that found in $filename"
);
$this->checkTestData($expected, $actual, 'Polled', $os, $module, $filename, $helper, $phpunit_debug);
}
$this->assertTrue(true, "Tested $os successfully"); // avoid no asserts error
DeviceCache::flush(); // clear cached devices
$this->travelBack();
}
@@ -184,4 +172,18 @@ class OSModulesTest extends DBTestCase
return $mock;
});
}
private function checkTestData(array $expected, array $actual, string $type, string $os, mixed $module, string $filename, ModuleTestHelper $helper, bool $phpunit_debug): void
{
// try simple and fast comparison first, if that fails, do a costly/well formatted comparison
if ($expected != $actual) {
$message = Color::colorize('bg-red', "OS $os: $type $module data does not match that found in $filename");
$message .= PHP_EOL;
$message .= ($type == 'Discovered'
? $helper->getDiscoveryOutput($phpunit_debug ? null : $module)
: $helper->getPollerOutput($phpunit_debug ? null : $module));
$this->assertSame(Arr::dot($expected), Arr::dot($actual), $message);
}
}
}