Skip to content

Commit

Permalink
fix tests that fail in the pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
Tattoo committed Oct 19, 2023
1 parent 6c4a267 commit 5d91ce1
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 9 deletions.
1 change: 0 additions & 1 deletion .github/workflows/run-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ runs:
uses: actions/setup-python@v4
with:
python-version: ${{ inputs.python-version }}
cache: 'pip'
- name: Install dependencies
shell: ${{ inputs.terminal }}
run: |
Expand Down
16 changes: 11 additions & 5 deletions src/oxygen/oxygen.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from datetime import datetime, timedelta
from inspect import getdoc, signature
from io import StringIO
from importlib import import_module
from pathlib import Path
from shutil import copy as copy_file
from traceback import format_exception
Expand Down Expand Up @@ -50,14 +51,19 @@ def handlers(self):
return self._handlers

def _register_handlers(self):
for tool_name, config in self.config.items():
for tool_name, handler_config in self.config.items():
try:
handler_class = getattr(__import__(tool_name,
fromlist=[config['handler']]),
config['handler'])
handler_class = getattr(import_module(tool_name,
handler_config['handler']),
handler_config['handler'])
except ModuleNotFoundError as e:
raise InvalidConfigurationException(e)
handler = handler_class(config)
except TypeError as e:
print(tool_name)
print(handler_config)
print(self.config)
raise
handler = handler_class(handler_config)
self._handlers[tool_name] = handler


Expand Down
2 changes: 1 addition & 1 deletion tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def install(context, package=None):
'https://github.com/CleanCut/green/blob/master/cli-options.txt#L5',
})
def utest(context, test=None):
run(f'green {" ".join(test) if test else UNIT_TESTS}',
run(f'green {" ".join(test) if test else UNIT_TESTS} -vvv',
env={'PYTHONPATH': str(SRCPATH)},
pty=(not system() == 'Windows'))

Expand Down
13 changes: 11 additions & 2 deletions tests/utest/zap/test_zap_cli.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import sys

from unittest import TestCase
from unittest.mock import ANY, Mock, create_autospec, patch

from robot.running.model import TestSuite

from oxygen.oxygen import OxygenCLI
from ..helpers import RESOURCES_PATH
from ..helpers import get_config, RESOURCES_PATH


class TestOxygenZapCLI(TestCase):
Expand All @@ -16,6 +19,12 @@ def setUp(self):
self.mock = Mock()
self.mock.running.build_suite = Mock(return_value=self.expected_suite)

def tearDown(self):
self.cli = None
self.handler = None
self.expected_suite = None
self.mock = None

def test_cli(self):
self.assertEqual(
self.handler.cli(),
Expand Down Expand Up @@ -81,7 +90,7 @@ def test_cli_run_with_accepted_risk_level(self, mock_robot_iface):
def test_cli_run_with_required_confidence_level(self, mock_robot_iface):
mock_robot_iface.return_value = self.mock

cmd_args = f"oxygen oxygen.zap {self.ZAP_XML} " "--required-confidence-level 3"
cmd_args = f"oxygen oxygen.zap {self.ZAP_XML} --required-confidence-level 3"
with patch.object(sys, "argv", cmd_args.split()):
self.cli.run()

Expand Down

0 comments on commit 5d91ce1

Please sign in to comment.