add result "notfail" option

faucetsdn · May 19, 2021 · 6ec3d7a · 6ec3d7a
1 parent ea1559c
commit 6ec3d7a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/daq/report.py b/daq/report.py
@@ -270,7 +270,9 @@ def _analyse_and_write_results(self):
 
                 # The device overall fails if any result is unexpected
                 if result_dict["result"] != required_result:
-                    if required_result == 'notfail' and result_dict["result"] == 'fail':
+                    if required_result == 'notfail' and result_dict["result"] != 'fail':
+                        pass
+                    else:
                         passes = False
 
                 if result_dict["result"] == 'gone':
@@ -336,8 +338,8 @@ def _write_category_table(self):
                         # TODO remove when info tests are removed
                         if result_dict["result"] == 'info':
                             result_dict["result"] = 'pass'
-                        elif (result_dict["result"] == 'skip' 
-                            and test_info['required'] == 'notfail'):
+                        elif (result_dict["result"] == 'skip'
+                              and test_info['required'] == 'notfail'):
                             result = 'pass'
                         else:
                             result = "fail"

diff --git a/resources/setups/common/tests_config.json b/resources/setups/common/tests_config.json
@@ -91,12 +91,12 @@
         },
         "ntp.network.ntp_update_dhcp": {
             "category": "NTP",
-            "required": "pass",
+            "required": "notfail",
             "expected": "Required Pass"
         },
         "ntp.network.ntp_update_dns": {
             "category": "NTP",
-            "required": "pass",
+            "required": "notfail",
             "expected": "Required Pass"
         },
         "communication.network.min_send": {

diff --git a/subset/network/ntp_tests.py b/subset/network/ntp_tests.py
@@ -229,7 +229,6 @@ def test_ntp_update():
         for test in ntp_tests:
             ntp_tests[test].add_summary("Not enough NTP packets received.")
             ntp_tests[test].result = test_result.SKIP
-            ntp_tests[test].write_results(report_filename)
     else:
         test_dns = ntp_configured_by_dns()
         local_ntp_ip = ntp_server_from_ip(device_address)