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

OS Testing update (#7971)

Browse Source 
* OS Testing update
Option on pre-commit.php to run tests for just one OS. Reorganize tests a bit to support this.
Improved bgp-peers capture and os module capture (initial)
Better output when phpunit tests fail

* fix a couple issues.  Better output for another

* Use the correct setup function
This commit is contained in:
Tony Murray
2017-12-28 16:12:08 -06:00
committed by GitHub
parent 12373d0f60
commit 20865b0ca4
7 changed files with 120 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
LibreNMS/Util/ModuleTestHelper.php
View File

@@ -40,6 +40,8 @@ class ModuleTestHelper
private $json_dir;
private $file_name;
private $module_tables;
private $discovery_output;
private $poller_output;
/**
@@ -377,7 +379,7 @@ class ModuleTestHelper
public function generateTestData(Snmpsim $snmpsim, $no_save = false)
{
global $device;
global $device, $debug, $vdebug;
// Remove existing device in case it didn't get removed previously
if ($existing_device = device_by_name($snmpsim->getIp())) {
@@ -402,16 +404,19 @@ class ModuleTestHelper
// Run discovery
if ($this->quiet) {
ob_start();
$save_debug = $debug;
$save_vedbug = $vdebug;
$debug = true;
$vdebug = false;
}
discover_device($device, $this->getArgs());
if ($this->quiet) {
$discovery_output = ob_get_contents();
$this->discovery_output = ob_get_contents();
ob_end_clean();
d_echo($discovery_output);
d_echo(PHP_EOL);
$debug = $save_debug;
$vdebug = $save_vedbug;
}
$this->qPrint(PHP_EOL);
@@ -420,13 +425,20 @@ class ModuleTestHelper
$data = array_merge_recursive($data, $this->dumpDb($device['device_id'], 'discovery'));
// Run the poller
ob_start();
poll_device($device, $this->getArgs());
$poller_output = ob_get_contents();
ob_end_clean();
if ($this->quiet) {
ob_start();
$debug = true;
$vdebug = false;
}
d_echo($poller_output);
d_echo(PHP_EOL);
poll_device($device, $this->getArgs());
if ($this->quiet) {
$this->poller_output = ob_get_contents();
ob_end_clean();
$debug = $save_debug;
$vdebug = $save_vedbug;
}
// Dump polled data
$data = array_merge_recursive($data, $this->dumpDb($device['device_id'], 'poller'));
@@ -497,15 +509,22 @@ class ModuleTestHelper
$rows = dbFetchRows("SELECT * FROM `$table` $join $where", $params);
// remove unwanted fields
$keys = array_flip($info['excluded_fields']);
$formatted_data = array_map(function ($row) use ($keys) {
return array_diff_key($row, $keys);
}, $rows);
if (isset($info['included_fields'])) {
$keys = array_flip($info['included_fields']);
$rows = array_map(function ($row) use ($keys) {
return array_intersect_key($row, $keys);
}, $rows);
} elseif (isset($info['excluded_fields'])) {
$keys = array_flip($info['excluded_fields']);
$rows = array_map(function ($row) use ($keys) {
return array_diff_key($row, $keys);
}, $rows);
}
if (isset($key)) {
$data[$module][$key][$table] = $formatted_data;
$data[$module][$key][$table] = $rows;
} else {
$data[$module][$table] = $formatted_data;
$data[$module][$table] = $rows;
}
}
}
@@ -524,6 +543,16 @@ class ModuleTestHelper
return array_intersect_key($this->module_tables, array_flip($this->getModules()));
}
public function getLastDiscoveryOutput()
{
return $this->discovery_output;
}
public function getLastPollerOutput()
{
return $this->poller_output;
}
/**
* Get a list of all modules that support capturing data
*