Fix invalid test data (#9099)

* Fix invalid test data and add test for it * fix bgp * add missing comma back
librenms · Aug 28, 2018 · f73f7ec · f73f7ec
1 parent 31a21ba
commit f73f7ec
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 118 deletions.
diff --git a/LibreNMS/Util/ModuleTestHelper.php b/LibreNMS/Util/ModuleTestHelper.php
@@ -226,6 +226,7 @@ private function collectOids($device_id)
      *
      * @param array $modules
      * @return array
+     * @throws InvalidModuleException
      */
     public static function findOsWithData($modules = [])
     {
@@ -253,11 +254,15 @@ public static function findOsWithData($modules = [])
                 continue;  // no test data for selected modules
             }
 
-            $os_list[$base_name] = [
-                $os,
-                $variant,
-                self::resolveModuleDependencies($valid_modules),
-            ];
+            try {
+                $os_list[$base_name] = [
+                    $os,
+                    $variant,
+                    self::resolveModuleDependencies($valid_modules),
+                ];
+            } catch (InvalidModuleException $e) {
+                throw new InvalidModuleException("Invalid module " . $e->getMessage() . " in $os $variant");
+            }
         }
 
         return $os_list;

diff --git a/tests/OSModulesTest.php b/tests/OSModulesTest.php
@@ -31,6 +31,22 @@
 
 class OSModulesTest extends DBTestCase
 {
+    /**
+     * Test all modules for a particular OS
+     *
+     * @group os
+     * @dataProvider dumpedDataProvider
+     */
+    public function testDataIsValid($os, $variant, $modules)
+    {
+        // special case if data provider throws exception
+        if ($os === false) {
+            $this->fail($modules);
+        }
+
+        $this->assertNotEmpty($modules, "No modules to test for $os $variant");
+    }
+
     /**
      * Test all modules for a particular OS
      *
@@ -105,6 +121,11 @@ public function dumpedDataProvider()
             $modules = explode(',', getenv('TEST_MODULES'));
         }
 
-        return ModuleTestHelper::findOsWithData($modules);
+        try {
+            return ModuleTestHelper::findOsWithData($modules);
+        } catch (InvalidModuleException $e) {
+            // special case for exception
+            return [[false, false, $e->getMessage()]];
+        }
     }
 }
diff --git a/tests/data/arris-d5.json b/tests/data/arris-d5.json
@@ -10986,18 +10986,6 @@
         },
         "poller": "matches discovery"
     },
-    "bgp-peers": {
-        "discovery": {
-            "devices": [
-                {
-                    "bgpLocalAs": null
-                }
-            ],
-            "bgpPeers": [],
-            "bgpPeers_cbgp": []
-        },
-        "poller": "matches discovery"
-    },
     "vlans": {
         "discovery": {
             "vlans": [

diff --git a/tests/data/linux_ntp-client-legacy.json b/tests/data/linux_ntp-client-legacy.json
@@ -1,55 +1,57 @@
 {
-    "discovery": {
-        "applications": {
-            "app_type": "ntp-client",
-            "app_state": "UNKNOWN",
-            "discovered": "1",
-            "app_state_prev": null,
-            "app_status": "",
-            "app_instance": ""
-        },
-        "application_metrics": []
-    },
-    "poller": {
-        "applications": {
-            "app_type": "ntp-client",
-            "app_state": "OK",
-            "discovered": "1",
-            "app_state_prev": "UNKNOWN",
-            "app_status": "",
-            "app_instance": ""
-        },
-        "application_metrics": [
-            {
-                "metric": "clk_jitter",
-                "value": "0.853",
-                "value_prev": null,
-                "app_type": "ntp-client"
-            },
-            {
-                "metric": "clk_wander",
-                "value": "0.025",
-                "value_prev": null,
-                "app_type": "ntp-client"
+    "applications": {
+        "discovery": {
+            "applications": {
+                "app_type": "ntp-client",
+                "app_state": "UNKNOWN",
+                "discovered": "1",
+                "app_state_prev": null,
+                "app_status": "",
+                "app_instance": ""
             },
-            {
-                "metric": "frequency",
-                "value": "91.141",
-                "value_prev": null,
-                "app_type": "ntp-client"
-            },
-            {
-                "metric": "offset",
-                "value": "0.702900",
-                "value_prev": null,
-                "app_type": "ntp-client"
+            "application_metrics": []
+        },
+        "poller": {
+            "applications": {
+                "app_type": "ntp-client",
+                "app_state": "OK",
+                "discovered": "1",
+                "app_state_prev": "UNKNOWN",
+                "app_status": "",
+                "app_instance": ""
             },
-            {
-                "metric": "sys_jitter",
-                "value": "2.581995",
-                "value_prev": null,
-                "app_type": "ntp-client"
-            }
-        ]
+            "application_metrics": [
+                {
+                    "metric": "clk_jitter",
+                    "value": "0.853",
+                    "value_prev": null,
+                    "app_type": "ntp-client"
+                },
+                {
+                    "metric": "clk_wander",
+                    "value": "0.025",
+                    "value_prev": null,
+                    "app_type": "ntp-client"
+                },
+                {
+                    "metric": "frequency",
+                    "value": "91.141",
+                    "value_prev": null,
+                    "app_type": "ntp-client"
+                },
+                {
+                    "metric": "offset",
+                    "value": "0.702900",
+                    "value_prev": null,
+                    "app_type": "ntp-client"
+                },
+                {
+                    "metric": "sys_jitter",
+                    "value": "2.581995",
+                    "value_prev": null,
+                    "app_type": "ntp-client"
+                }
+            ]
+        }
     }
 }
diff --git a/tests/data/linux_ntp-client-v1.json b/tests/data/linux_ntp-client-v1.json
@@ -1,55 +1,57 @@
 {
-    "discovery": {
-        "applications": {
-            "app_type": "ntp-client",
-            "app_state": "UNKNOWN",
-            "discovered": "1",
-            "app_state_prev": null,
-            "app_status": "",
-            "app_instance": ""
-        },
-        "application_metrics": []
-    },
-    "poller": {
-        "applications": {
-            "app_type": "ntp-client",
-            "app_state": "OK",
-            "discovered": "1",
-            "app_state_prev": "UNKNOWN",
-            "app_status": "",
-            "app_instance": ""
-        },
-        "application_metrics": [
-            {
-                "metric": "clk_jitter",
-                "value": "0.853",
-                "value_prev": null,
-                "app_type": "ntp-client"
-            },
-            {
-                "metric": "clk_wander",
-                "value": "0.025",
-                "value_prev": null,
-                "app_type": "ntp-client"
+    "applications": {
+        "discovery": {
+            "applications": {
+                "app_type": "ntp-client",
+                "app_state": "UNKNOWN",
+                "discovered": "1",
+                "app_state_prev": null,
+                "app_status": "",
+                "app_instance": ""
             },
-            {
-                "metric": "frequency",
-                "value": "91.141",
-                "value_prev": null,
-                "app_type": "ntp-client"
-            },
-            {
-                "metric": "offset",
-                "value": "0.702900",
-                "value_prev": null,
-                "app_type": "ntp-client"
+            "application_metrics": []
+        },
+        "poller": {
+            "applications": {
+                "app_type": "ntp-client",
+                "app_state": "OK",
+                "discovered": "1",
+                "app_state_prev": "UNKNOWN",
+                "app_status": "",
+                "app_instance": ""
             },
-            {
-                "metric": "sys_jitter",
-                "value": "2.581995",
-                "value_prev": null,
-                "app_type": "ntp-client"
-            }
-        ]
+            "application_metrics": [
+                {
+                    "metric": "clk_jitter",
+                    "value": "0.853",
+                    "value_prev": null,
+                    "app_type": "ntp-client"
+                },
+                {
+                    "metric": "clk_wander",
+                    "value": "0.025",
+                    "value_prev": null,
+                    "app_type": "ntp-client"
+                },
+                {
+                    "metric": "frequency",
+                    "value": "91.141",
+                    "value_prev": null,
+                    "app_type": "ntp-client"
+                },
+                {
+                    "metric": "offset",
+                    "value": "0.702900",
+                    "value_prev": null,
+                    "app_type": "ntp-client"
+                },
+                {
+                    "metric": "sys_jitter",
+                    "value": "2.581995",
+                    "value_prev": null,
+                    "app_type": "ntp-client"
+                }
+            ]
+        }
     }
 }