mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Fix test regressions introduced while tests were broken (#16399)
* AuthSSOTest: clear roles cache * PollingJob: When a poller module doesn't exist, return null instead of false. Skip all other checks and disable polling in that case. * Sensors: Guess high and low limits separately as needed * Sensors: drac test psu current data was wrong, referencing the snmprec, 8 / 10 and 0 / 10 should be the values NOTE: drac is messed up and runs a billion snmp queriess for no reason * please phpstan * Sensors: limits reference old code move to "creating" * Fix gw-eydfa accidental assignment * Fix ies5000 test data now that the bad state is removed * Fix ies5000 test data part 2 * Move sensor discovery reset into discover_device() * infinera remove duplicate sensor (also a lot of trailing whitespace apparently) * Fix innovaphone bad yaml discovery * module tests should be using null when test data doesn't exist, not an empty array * When discovery or polling is not supported, dump null instead of an array. Account for nulls in testing * update ISE serial * Janitza was seemingly wrong before * Remove some private data * bgp-peers requires ipv4-addresses and ipv6-addresses for bgpPeerIface * fix polycomLens broken state sensor discovery * Raritan pdu and pdu2 test data was combined in one test file, split it out * scs-ks duplicate temperature sensor indexes * sentry3 someone tried to avoid breaking stuff but just broke things more * smartos-dcp-m fix incorrect numeric oids * ssu2000 apparently test data was wrong, must have fixed a bug in the code. * timos remove duplicate dbm sensor definitions * bgpPeerIface is working in tests now * Fix moxa-etherdevice when mibs are a bit different * xw_to_dbm negative values should return null * Update cisco test data due previous fixes/changes * One more bgpPeerIface * Add orderBy to ospf module db dumps * Remove links test data for now * Improve handling of bad data in ipv6-addresses module
This commit is contained in:
@@ -733,8 +733,8 @@ class ModuleTestHelper
|
||||
|
||||
// only dump data for the given modules (and modules that support dumping)
|
||||
foreach ($modules as $module) {
|
||||
$module_data = Module::fromName($module)->dump(DeviceCache::get($device_id));
|
||||
if ($module_data !== false) {
|
||||
$module_data = Module::fromName($module)->dump(DeviceCache::get($device_id), $type);
|
||||
if ($module_data !== null) {
|
||||
$data[$module][$type] = $this->dumpToArray($module_data);
|
||||
}
|
||||
}
|
||||
@@ -774,7 +774,7 @@ class ModuleTestHelper
|
||||
if (isset($this->discovery_module_output[$module])) {
|
||||
return $this->discovery_module_output[$module];
|
||||
} else {
|
||||
return "Module $module not run. Modules: " . implode(',', array_keys($this->poller_module_output));
|
||||
return "Module $module not run. Modules: " . implode(',', array_keys($this->discovery_module_output));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user