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 2b034e7
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 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
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
19 changes: 16 additions & 3 deletions tests/utest/zap/test_zap_cli.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,34 @@
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):
ZAP_XML = str(RESOURCES_PATH / "zap" / "zap.xml")

def setUp(self):
self.cli = OxygenCLI()
self.handler = self.cli.handlers["oxygen.zap"]
try:
self.handler = self.cli.handlers["oxygen.zap"]
except ValuError 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(),
Expand Down Expand Up @@ -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()

Expand Down

0 comments on commit 2b034e7

Please sign in to comment.