Merge pull request #29 from andrewfraley/afraley/enable_6183_tests

fix and enable tests for sb6183
andrewfraley · Jul 2, 2021 · 2359027 · 2359027
2 parents f66ee1c + 83862fa
commit 2359027
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/tests/mockups/sb6123.json b/tests/mockups/sb6123.json
diff --git a/tests/mockups/sb6123.html → tests/mockups/sb6183.html b/tests/mockups/sb6123.html → tests/mockups/sb6183.html
diff --git a/tests/mockups/sb6183.json b/tests/mockups/sb6183.json
@@ -0,0 +1 @@
+{"downstream": [{"channel_id": "1", "frequency": 603000000, "power": -7.6, "snr": 37.0, "corrected": 219, "uncorrectables": 0}, {"channel_id": "2", "frequency": 681000000, "power": -6.7, "snr": 37.2, "corrected": 157, "uncorrectables": 0}, {"channel_id": "3", "frequency": 687000000, "power": -6.5, "snr": 37.2, "corrected": 132, "uncorrectables": 0}, {"channel_id": "4", "frequency": 693000000, "power": -6.3, "snr": 37.3, "corrected": 102, "uncorrectables": 0}, {"channel_id": "5", "frequency": 627000000, "power": -7.5, "snr": 37.0, "corrected": 228, "uncorrectables": 0}, {"channel_id": "6", "frequency": 633000000, "power": -7.7, "snr": 36.9, "corrected": 289, "uncorrectables": 0}, {"channel_id": "7", "frequency": 639000000, "power": -7.6, "snr": 36.9, "corrected": 375, "uncorrectables": 0}, {"channel_id": "8", "frequency": 645000000, "power": -7.5, "snr": 37.0, "corrected": 329, "uncorrectables": 0}, {"channel_id": "9", "frequency": 651000000, "power": -7.4, "snr": 37.1, "corrected": 185, "uncorrectables": 0}, {"channel_id": "10", "frequency": 657000000, "power": -7.1, "snr": 37.1, "corrected": 199, "uncorrectables": 0}, {"channel_id": "11", "frequency": 663000000, "power": -7.0, "snr": 37.1, "corrected": 186, "uncorrectables": 0}, {"channel_id": "12", "frequency": 669000000, "power": -7.2, "snr": 37.1, "corrected": 96128, "uncorrectables": 359367}, {"channel_id": "13", "frequency": 675000000, "power": -6.7, "snr": 36.9, "corrected": 36896, "uncorrectables": 142578}, {"channel_id": "14", "frequency": 609000000, "power": -7.5, "snr": 37.1, "corrected": 201, "uncorrectables": 0}, {"channel_id": "15", "frequency": 615000000, "power": -7.3, "snr": 37.1, "corrected": 205, "uncorrectables": 0}, {"channel_id": "16", "frequency": 621000000, "power": -7.4, "snr": 37.1, "corrected": 173, "uncorrectables": 0}], "upstream": [{"channel_id": "1", "symbol_rate": 5120, "frequency": 35600000, "power": 46.3}, {"channel_id": "2", "symbol_rate": 5120, "frequency": 16400000, "power": 45.7}, {"channel_id": "3", "symbol_rate": 5120, "frequency": 22800000, "power": 45.7}, {"channel_id": "4", "symbol_rate": 5120, "frequency": 29200000, "power": 47.2}]}
diff --git a/tests/test_arris_stats.py b/tests/test_arris_stats.py
@@ -127,9 +127,6 @@ def test_modem_parse_functions(self):
         modems_supported = arris_stats.modems_supported
 
         for modem in modems_supported:
-            # Skipping the sb6183 until I can get example html
-            if modem == 'sb6183':
-                continue
 
             # Get the control values
             with open('tests/mockups/%s.json' % modem) as f:
@@ -154,10 +151,8 @@ def test_modem_parse_functions(self):
             # Verify the values
             root_indexes = ['downstream', 'upstream']
             for root_index in root_indexes:
-                row_index = 0
                 for row in control_values[root_index]:
-                    self.assertEqual(row, stats[root_index][row_index])
-                    row_index += 1
+                    self.assertIn(row, stats[root_index])
 
 
 if __name__ == '__main__':