..

nfx · nfx · commit fbd1c0bbdd48 · 2023-12-04T11:14:49.000-05:00
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -1,7 +1,6 @@
 import collections
 import functools
 import logging
-import random
 from datetime import timedelta
 from functools import partial
 
@@ -90,21 +89,17 @@ def sql_fetch_all(sql_backend):
 
 
 @pytest.fixture
-def user_pool(ws):
-    return list(ws.users.list(filter="displayName sw 'test-user-'", attributes="id, userName, displayName"))
-
-
-@pytest.fixture
-def make_ucx_group(make_random, make_group, make_acc_group, user_pool):
-    assert (
-        len(user_pool) >= 1
-    ), "must have 'test-user-*' test users with id, userName and displayName in your test workspace"
-
-    def inner():
-        display_name = f"ucx_{make_random(4)}"
-        members = [_.id for _ in random.choices(user_pool, k=random.randint(1, 40))]
-        ws_group = make_group(display_name=display_name, members=members, entitlements=["allow-cluster-create"])
-        acc_group = make_acc_group(display_name=display_name, members=members)
+def make_ucx_group(make_random, make_group, make_acc_group, make_user):
+    def inner(workspace_group_name=None, account_group_name=None):
+        random_name = f"ucx_{make_random(4)}"
+        if not workspace_group_name:
+            workspace_group_name = random_name
+        if not account_group_name:
+            account_group_name = random_name
+        user = make_user()
+        members = [user.id]
+        ws_group = make_group(display_name=workspace_group_name, members=members, entitlements=["allow-cluster-create"])
+        acc_group = make_acc_group(display_name=account_group_name, members=members)
         return ws_group, acc_group
 
     return inner
diff --git a/tests/integration/test_conftest.py b/tests/integration/test_conftest.py
@@ -1,4 +1,9 @@
 def test_make_ucx_group(make_ucx_group):
-    ws_group_a, acc_group_a = make_ucx_group()
-    assert ws_group_a is not None
-    assert acc_group_a is not None
+    ws, acc = make_ucx_group()
+    assert ws is not None
+    assert acc is not None
+
+
+def test_make_ucx_group_with_names(make_ucx_group, make_random):
+    ws, acc = make_ucx_group(workspace_group_name=f"foo_{make_random(4)}", account_group_name=f"bar_{make_random(4)}")
+    assert ws.display_name != acc.display_name
