Skip to content
Snippets Groups Projects
Commit 60c6a7fd authored by Janet Goldstein's avatar Janet Goldstein
Browse files

WS-693: system mediator tests Just Work now

parent a586dddc
No related branches found
No related tags found
1 merge request!531WS-693: system mediator tests Just Work now
Pipeline #3055 passed
......@@ -29,7 +29,6 @@ logger.addHandler(logging.StreamHandler(sys.stdout))
nsp = argparse.Namespace(force_fail=["-1"])
@pytest.mark.skip("Broken due to queue/messenger rework")
@patch("system_mediator.arbitrator.MessageSender", MagicMock())
@pytest.mark.usefixtures("mock_workflow_info", "mock_capability_info")
def mock_arbiter(mock_workflow_info: WorkflowInfo, mock_capability_info: CapabilityInfo) -> Arbiter:
......@@ -75,7 +74,6 @@ arbiter = mock_arbiter(mock_workflow_info=mock_workflow_info, mock_capability_in
class TestArbiter:
"""Tests for the arbitrator"""
@pytest.mark.skip("Broken due to queue/messenger rework")
def test_which_option(self):
"""
Confirm that which_option works as expected.
......@@ -86,7 +84,6 @@ class TestArbiter:
assert arbiter.intervention == "force_fail"
assert arbiter.wf_request_id == "-1"
@pytest.mark.skip("ignores router mock?")
@pytest.mark.usefixtures("mock_workflow_requests")
def test_intervene_fail(
self,
......@@ -108,7 +105,6 @@ class TestArbiter:
arbiter.intervene_fail(arbiter.wf_request_id)
assert arbiter.message_router.send_message.call_count == 1
@pytest.mark.skip("Broken due to queue/messenger rework")
@pytest.mark.usefixtures("mock_workflow_requests", "mock_capability_execution")
def test_resolve_fail(
self,
......@@ -126,7 +122,6 @@ class TestArbiter:
arbiter.cinfo.lookup_execution_by_workflow_request_id = MagicMock(return_value=mock_capability_execution)
assert arbiter.resolve_fail(arbiter.wf_request_id) is None
@pytest.mark.skip("Broken due to queue/messenger rework")
@pytest.mark.usefixtures("mock_workflow_requests", "mock_capability_execution")
def test_check_status(
self,
......@@ -149,6 +144,5 @@ class TestArbiter:
assert arbiter.check_status(arbiter.wf_request_id) is True
@pytest.mark.skip("Broken due to queue/messenger rework")
def test_intercede(self):
assert arbiter.intercede() is None
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment