From 110a2509fd93c964d4d2616ee16de3e8fafc081a Mon Sep 17 00:00:00 2001 From: Tattoo Date: Thu, 19 Oct 2023 11:58:13 +0300 Subject: [PATCH] fix tests that fail in the pipeline --- .github/workflows/run-tests/action.yml | 1 - tasks.py | 2 +- tests/utest/zap/test_zap_cli.py | 19 ++++++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-tests/action.yml b/.github/workflows/run-tests/action.yml index 4c047d5..15606f9 100644 --- a/.github/workflows/run-tests/action.yml +++ b/.github/workflows/run-tests/action.yml @@ -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: | diff --git a/tasks.py b/tasks.py index 9d47463..0782399 100644 --- a/tasks.py +++ b/tasks.py @@ -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')) diff --git a/tests/utest/zap/test_zap_cli.py b/tests/utest/zap/test_zap_cli.py index 49db088..449276e 100644 --- a/tests/utest/zap/test_zap_cli.py +++ b/tests/utest/zap/test_zap_cli.py @@ -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): @@ -11,11 +14,21 @@ class TestOxygenZapCLI(TestCase): def setUp(self): self.cli = OxygenCLI() - self.handler = self.cli.handlers["oxygen.zap"] + try: + self.handler = self.cli.handlers["oxygen.zap"] + except ValueError as e: + print(self.cli.handlers) + raise self.expected_suite = create_autospec(TestSuite) 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(), @@ -81,7 +94,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()