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

Fix tests... (#8080)

Browse Source 
Don't exit when we can't add a device, fail :)
This commit is contained in:
Tony Murray
2018-01-12 15:24:12 -06:00
committed by GitHub
parent 8ec6f138bc
commit 44c1ee5f43
7 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LibreNMS/Util/ModuleTestHelper.php
View File

@@ -398,8 +398,8 @@ class ModuleTestHelper
$device_id = addHost($snmpsim->getIp(), 'v2c', $snmpsim->getPort()); $device_id = addHost($snmpsim->getIp(), 'v2c', $snmpsim->getPort());
$this->qPrint("Added device: $device_id\n"); $this->qPrint("Added device: $device_id\n");
} catch (\Exception $e) { } catch (\Exception $e) {
echo $e->getMessage() . PHP_EOL; echo $this->file_name . ': ' . $e->getMessage() . PHP_EOL;
exit; return null;
} }
// Populate the device variable // Populate the device variable

4
tests/OSModulesTest.php
View File

@@ -55,6 +55,10 @@ class OSModulesTest extends DBTestCase
$results = $helper->generateTestData($snmpsim, true); $results = $helper->generateTestData($snmpsim, true);
if (is_null($results)) {
$this->fail("$target_os: Failed to collect data.");
}
foreach ($modules as $module) { foreach ($modules as $module) {
$this->assertEquals( $this->assertEquals(
$expected_data[$module]['discovery'], $expected_data[$module]['discovery'],

0
tests/data/edgecos_ECS3510-52T.json → tests/data/edgecos_ecs3510-52t.json
View File

6
tests/data/edgecos_ECS4210-28T.json → tests/data/edgecos_ecs4210-28t.json
View File

@@ -30,8 +30,8 @@
"mempool_precision": "1", "mempool_precision": "1",
"mempool_descr": "Memory", "mempool_descr": "Memory",
"mempool_perc": "93", "mempool_perc": "93",
"mempool_used": "124489728", "mempool_used": "124547072",
"mempool_free": "9728000", "mempool_free": "9670656",
"mempool_total": "134217728", "mempool_total": "134217728",
"mempool_largestfree": null, "mempool_largestfree": null,
"mempool_lowestfree": null, "mempool_lowestfree": null,
@@ -50,7 +50,7 @@
"processor_oid": ".1.3.6.1.4.1.259.10.1.42.101.1.39.2.1.0", "processor_oid": ".1.3.6.1.4.1.259.10.1.42.101.1.39.2.1.0",
"processor_index": "0", "processor_index": "0",
"processor_type": "edgecos", "processor_type": "edgecos",
"processor_usage": "45", "processor_usage": "100",
"processor_descr": "Processor", "processor_descr": "Processor",
"processor_precision": "1", "processor_precision": "1",
"processor_perc_warn": "75" "processor_perc_warn": "75"

2
tests/data/edgecos_ECS4510-28F.json → tests/data/edgecos_ecs4510-28f.json
View File

@@ -50,7 +50,7 @@
"processor_oid": ".1.3.6.1.4.1.259.10.1.24.1.39.2.1.0", "processor_oid": ".1.3.6.1.4.1.259.10.1.24.1.39.2.1.0",
"processor_index": "0", "processor_index": "0",
"processor_type": "edgecos", "processor_type": "edgecos",
"processor_usage": "15", "processor_usage": "31",
"processor_descr": "Processor", "processor_descr": "Processor",
"processor_precision": "1", "processor_precision": "1",
"processor_perc_warn": "75" "processor_perc_warn": "75"

2
tests/data/edgecos_ECS4510-52T.json → tests/data/edgecos_ecs4510-52t.json
View File

@@ -50,7 +50,7 @@
"processor_oid": ".1.3.6.1.4.1.259.10.1.24.1.39.2.1.0", "processor_oid": ".1.3.6.1.4.1.259.10.1.24.1.39.2.1.0",
"processor_index": "0", "processor_index": "0",
"processor_type": "edgecos", "processor_type": "edgecos",
"processor_usage": "28", "processor_usage": "27",
"processor_descr": "Processor", "processor_descr": "Processor",
"processor_precision": "1", "processor_precision": "1",
"processor_perc_warn": "75" "processor_perc_warn": "75"

2
tests/data/edgecos_ES3528MV2.json → tests/data/edgecos_es3528mv2.json
View File

@@ -50,7 +50,7 @@
"processor_oid": ".1.3.6.1.4.1.259.10.1.22.1.39.2.1.0", "processor_oid": ".1.3.6.1.4.1.259.10.1.22.1.39.2.1.0",
"processor_index": "0", "processor_index": "0",
"processor_type": "edgecos", "processor_type": "edgecos",
"processor_usage": "22", "processor_usage": "20",
"processor_descr": "Processor", "processor_descr": "Processor",
"processor_precision": "1", "processor_precision": "1",
"processor_perc_warn": "75" "processor_perc_warn": "75"