Skip to content

Commit 2d49e6a

Browse files
committed
Add marks to tests so they can be run as a subset
1 parent 3422c09 commit 2d49e6a

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

tests/integration/test_model.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -848,12 +848,12 @@ async def test_get_machines(event_loop):
848848

849849
@base.bootstrapped
850850
@pytest.mark.asyncio
851+
@pytest.mark.wait_for_idle
851852
async def test_wait_for_idle_without_units(event_loop):
852853
async with base.CleanModel() as model:
853854
await model.deploy(
854855
'ubuntu',
855856
application_name='ubuntu',
856-
series='bionic',
857857
channel='stable',
858858
num_units=0,
859859
)
@@ -863,12 +863,12 @@ async def test_wait_for_idle_without_units(event_loop):
863863

864864
@base.bootstrapped
865865
@pytest.mark.asyncio
866+
@pytest.mark.wait_for_idle
866867
async def test_wait_for_idle_with_not_enough_units(event_loop):
867868
async with base.CleanModel() as model:
868869
await model.deploy(
869870
'ubuntu',
870871
application_name='ubuntu',
871-
series='bionic',
872872
channel='stable',
873873
num_units=2,
874874
)
@@ -878,6 +878,7 @@ async def test_wait_for_idle_with_not_enough_units(event_loop):
878878

879879
@base.bootstrapped
880880
@pytest.mark.asyncio
881+
@pytest.mark.wait_for_idle
881882
async def test_wait_for_idle_more_units_than_needed(event_loop):
882883
async with base.CleanModel() as model:
883884
charm_path = TESTS_DIR / 'charm'
@@ -900,13 +901,13 @@ async def test_wait_for_idle_more_units_than_needed(event_loop):
900901

901902
@base.bootstrapped
902903
@pytest.mark.asyncio
904+
@pytest.mark.wait_for_idle
903905
async def test_wait_for_idle_with_enough_units(event_loop):
904906
pytest.skip("This is testing juju functionality")
905907
async with base.CleanModel() as model:
906908
await model.deploy(
907909
'ubuntu',
908910
application_name='ubuntu',
909-
series='jammy',
910911
channel='stable',
911912
num_units=3,
912913
)
@@ -915,13 +916,13 @@ async def test_wait_for_idle_with_enough_units(event_loop):
915916

916917
@base.bootstrapped
917918
@pytest.mark.asyncio
919+
@pytest.mark.wait_for_idle
918920
async def test_wait_for_idle_with_exact_units(event_loop):
919921
pytest.skip("This is testing juju functionality")
920922
async with base.CleanModel() as model:
921923
await model.deploy(
922924
'ubuntu',
923925
application_name='ubuntu',
924-
series='jammy',
925926
channel='stable',
926927
num_units=2,
927928
)
@@ -930,6 +931,7 @@ async def test_wait_for_idle_with_exact_units(event_loop):
930931

931932
@base.bootstrapped
932933
@pytest.mark.asyncio
934+
@pytest.mark.wait_for_idle
933935
async def test_wait_for_idle_with_exact_units_scale_down(event_loop):
934936
"""Deploys 3 units, waits for them to be idle, then removes 2 of them,
935937
then waits for exactly 1 unit to be left.

0 commit comments

Comments
 (0)