Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
name: Tests
runs-on: ubuntu-20.04
needs: testrun_baseline
timeout-minutes: 40
timeout-minutes: 45
steps:
- name: Checkout source
uses: actions/checkout@v2.3.4
Expand Down
3 changes: 1 addition & 2 deletions framework/python/src/test_orc/test_orchestrator.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,14 +339,13 @@ def _run_test_module(self, module):
module_results = module_results_json["results"]
for test_result in module_results:
self._session.add_test_result(test_result)
self._session.add_total_tests(1)
except (FileNotFoundError, PermissionError,
json.JSONDecodeError) as results_error:
LOGGER.error(
f"Error occured whilst obbtaining results for module {module.name}")
LOGGER.debug(results_error)

self._session.add_total_tests(module.total_tests)

LOGGER.info("Test module " + module.name + " has finished")

def _get_module_status(self, module):
Expand Down
2 changes: 2 additions & 0 deletions modules/test/nmap/python/src/nmap_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ def _nmap_results_to_json(self, nmap_results):

def _process_nmap_json_results(self, nmap_results_json):
results = {}
if "host" not in nmap_results_json["nmaprun"]:
return results
if "ports" in nmap_results_json["nmaprun"]["host"]:
ports = nmap_results_json["nmaprun"]["host"]["ports"]
# Checking if an object is a JSON object
Expand Down
2 changes: 1 addition & 1 deletion testing/device_configs/tester1/device_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"enabled": true
},
"connection": {
"enabled": true
"enabled": false
},
"ntp": {
"enabled": true
Expand Down