Skip to content

Bug/test count nmap check #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jboddey merged 4 commits into from
Sep 26, 2023
Merged

Bug/test count nmap check #124

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4aa2602
Fix 2x bugs
jboddey Sep 18, 2023
3be2a5b
Modify testing
jboddey Sep 25, 2023
313a90b
Move test count
jboddey Sep 26, 2023
ccd8970
Merge branch 'dev' into bug/test-count-nmap-check
jboddey Sep 26, 2023
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
22 changes: 15 additions & 7 deletions framework/python/src/test_orc/test_orchestrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,22 @@ def run_test_modules(self):
self._test_in_progress = True
LOGGER.info(
f"Running test modules on device with mac addr {device.mac_addr}")

test_modules = []
for module in self._test_modules:

if module is None or not module.enable_container or not module.enabled:
continue

if not self._is_module_enabled(module, device):
continue

test_modules.append(module)
self.get_session().add_total_tests(len(module.tests))

for module in test_modules:
self._run_test_module(module)

LOGGER.info("All tests complete")

self._session.stop()
Expand Down Expand Up @@ -243,12 +257,6 @@ def _run_test_module(self, module):

device = self._session.get_target_device()

if module is None or not module.enable_container or not module.enabled:
return

if not self._is_module_enabled(module, device):
return

LOGGER.info("Running test module " + module.name)

try:
Expand Down Expand Up @@ -353,7 +361,7 @@ def _run_test_module(self, module):
f"Error occured whilst obbtaining results for module {module.name}")
LOGGER.debug(results_error)

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

def _get_module_status(self, module):
container = self._get_module_container(module)
Expand Down