From 21f5fc7414479d288d63dd55651e4a914ea835b9 Mon Sep 17 00:00:00 2001 From: charlie4284 Date: Fri, 19 Jan 2024 11:03:27 +0800 Subject: [PATCH] test: remove deprecated agent relation tests --- tests/integration/conftest.py | 1 - tests/integration/test_machine_agent.py | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index de0bc889..95236abe 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -273,7 +273,6 @@ async def jenkins_machine_agents_fixture( num_units=num_units, ) await machine_model.create_offer(f"{app.name}:{state.AGENT_RELATION}", state.AGENT_RELATION) - await machine_model.create_offer(f"{app.name}:slave", state.DEPRECATED_AGENT_RELATION) await machine_model.wait_for_idle( apps=[app.name], status="blocked", idle_period=30, timeout=1200, check_freq=5 ) diff --git a/tests/integration/test_machine_agent.py b/tests/integration/test_machine_agent.py index 7362b25f..f22c74cd 100644 --- a/tests/integration/test_machine_agent.py +++ b/tests/integration/test_machine_agent.py @@ -50,15 +50,3 @@ async def test_jenkins_machine_agent_relation( # 2. Assert that the agent nodes are deregistered from Jenkins. assert not any((application.name in key for key in jenkins_client.get_nodes().keys())) - - -@pytest.mark.usefixtures("machine_deprecated_agent_related_app") -async def test_jenkins_machine_deprecated_agent_relation( - jenkins_machine_agents: Application, jenkins_client: jenkinsapi.jenkins.Jenkins -): - """ - arrange: given a cross controller cross model jenkins machine agent with an offer. - act: when the relation is setup through the offer. - assert: the relation succeeds and the agent is able to run jobs successfully. - """ - assert_job_success(jenkins_client, jenkins_machine_agents.name, "machine")