Skip to content

Commit

Permalink
Remove @mark.setup marks
Browse files Browse the repository at this point in the history
  • Loading branch information
mvlassis committed Jun 12, 2024
1 parent dace6e8 commit e0b055f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion requirements-integration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ websocket-client==1.6.2
# via
# kubernetes
# ops
websockets==8.1
websockets
# via juju
wsproto==1.2.0
# via
Expand Down
9 changes: 0 additions & 9 deletions tests/integration/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
]


@pytest.mark.setup
@pytest.fixture(scope="module")
def copy_libraries_into_tester_charm() -> None:
"""Ensure that the tester charms use the current libraries."""
Expand All @@ -49,14 +48,12 @@ def copy_libraries_into_tester_charm() -> None:
shutil.copyfile(lib.as_posix(), (DASHBOARD_LINKS_REQUIRER_TESTER_CHARM / lib).as_posix())


@pytest.mark.setup
@pytest_asyncio.fixture
async def lightkube_client():
lightkube_client = Client(field_manager="test")
yield lightkube_client


@pytest.mark.setup
@pytest.mark.asyncio
@pytest.mark.abort_on_fail
async def test_build_and_deploy(ops_test: OpsTest):
Expand All @@ -77,7 +74,6 @@ async def test_build_and_deploy(ops_test: OpsTest):
)


@pytest.mark.setup
@pytest.mark.asyncio
@pytest.mark.abort_on_fail
async def test_add_profile_relation(ops_test: OpsTest):
Expand All @@ -91,13 +87,11 @@ async def test_add_profile_relation(ops_test: OpsTest):
)


@pytest.mark.setup
@pytest.mark.asyncio
async def test_status(ops_test: OpsTest):
assert ops_test.model.applications[CHARM_NAME].units[0].workload_status == "active"


@pytest.mark.setup
@pytest.mark.parametrize(
"location, default_link_texts",
[
Expand All @@ -124,7 +118,6 @@ def test_configmap_contents_no_relations_or_config(
)


@pytest.mark.setup
@pytest.mark.asyncio
async def test_configmap_contents_with_relations(
ops_test: OpsTest, copy_libraries_into_tester_charm, lightkube_client: Client
Expand Down Expand Up @@ -173,7 +166,6 @@ async def test_configmap_contents_with_relations(
assert len(links) == starting_n_links[location] + len(expected_links[location])


@pytest.mark.setup
@pytest.mark.asyncio
async def test_configmap_contents_with_menu_links_from_config(
ops_test: OpsTest, lightkube_client: Client
Expand Down Expand Up @@ -251,7 +243,6 @@ async def test_configmap_contents_with_menu_links_from_config(
), f"unexpected number of links at {location}"


@pytest.mark.setup
@pytest.mark.asyncio
async def test_configmap_contents_with_ordering(ops_test: OpsTest, lightkube_client: Client):
"""Tests that, if we add a link order, the configmap contents update as expected.
Expand Down

0 comments on commit e0b055f

Please sign in to comment.