update testing for #205

* move resource group fixture to session (needs change https://gitlab.com/saltstack/pop/pytest-pop/-/merge_requests/4)
* make resource_group fixture allocate the resource group instead of just creating a string
* update resource group test since it is now a fixture
* on shutdown of the test session, remove the resource group which should cascade to remove all resources in the group
* move duplicated password fixture up to the common fixture config

Signed-off-by: Tom Scanlan <tscanlan@vmware.com>

tests/integration/conftest.py

@@ -46,11 +46,17 @@ def tags():
 
 
 @pytest.fixture(scope="session")
-def resource_group():
-    yield "rg-idem-inttest-" + "".join(
+async def resource_group(hub, ctx, location):
+    name = "rg-idem-inttest-" + "".join(
         random.choice(string.ascii_lowercase + string.digits) for _ in range(20)
     )
 
+    await hub.states.azurerm.resource.group.present(ctx, name, location)
+    yield name
+
+    # Clean up
+    await hub.states.azurerm.resource.group.absent(ctx, name, location)
+
 
 @pytest.fixture(scope="session")
 def vm():
@@ -190,3 +196,10 @@ def acr():
     yield "acrideminttest" + "".join(
         random.choice(string.ascii_lowercase + string.digits) for _ in range(8)
     )
+
+
+@pytest.fixture(scope="session")
+def password():
+    yield "#PASS" + "".join(
+        random.choice(string.ascii_lowercase + string.digits) for _ in range(16)
+    ) + "!"

tests/integration/states/azurerm/compute/test_virtual_machine.py

@@ -3,13 +3,6 @@
 import string
 
 
-@pytest.fixture(scope="session")
-def password():
-    yield "#PASS" + "".join(
-        random.choice(string.ascii_lowercase + string.digits) for _ in range(16)
-    ) + "!"
-
-
 @pytest.mark.run(order=5)
 @pytest.mark.asyncio
 async def test_present(hub, ctx, vm, resource_group, vnet, subnet, password):

tests/integration/states/azurerm/postgresql/test_server.py

@@ -3,13 +3,6 @@
 import string
 
 
-@pytest.fixture(scope="session")
-def password():
-    yield "#" + "".join(
-        random.choice(string.ascii_lowercase + string.digits) for _ in range(16)
-    ) + "!"
-
-
 @pytest.mark.run(order=3)
 @pytest.mark.asyncio
 async def test_present(hub, ctx, postgresql_server, resource_group, location, password):

tests/integration/states/azurerm/resource/test_group.py

@@ -5,21 +5,13 @@
 @pytest.mark.asyncio
 async def test_present(hub, ctx, resource_group, location):
     expected = {
-        "changes": {
-            "new": {
-                "location": location,
-                "name": resource_group,
-                "type": "Microsoft.Resources/resourceGroups",
-                "properties": {"provisioning_state": "Succeeded"},
-            },
-            "old": {},
-        },
-        "comment": f"Resource group {resource_group} has been created.",
         "name": resource_group,
         "result": True,
+        "comment": f"Resource group {resource_group} is already present.",
+        "changes": {},
     }
+
     ret = await hub.states.azurerm.resource.group.present(ctx, resource_group, location)
-    ret["changes"]["new"].pop("id")
     assert ret == expected