Skip to content
Snippets Groups Projects
Commit e85168cd authored by Radoslav Bodó's avatar Radoslav Bodó
Browse files

tests: prefer system paths for radosgw-admin, but also account for microceph

parent ab6f9bf6
No related branches found
No related tags found
No related merge requests found
...@@ -58,14 +58,19 @@ def microceph(): ...@@ -58,14 +58,19 @@ def microceph():
def radosuser(microceph_url, username, tenant="tenant1"): def radosuser(microceph_url, username, tenant="tenant1"):
"""rgwuser fixture""" """rgwuser fixture"""
radosgwadmin_bin = shutil.which(
"radosgw-admin",
path=os.pathsep.join([os.environ["PATH"], "/snap/bin"])
)
subprocess.run( subprocess.run(
["/snap/bin/radosgw-admin", "user", "rm", f"--uid={tenant}${username}", "--purge-data", "--purge-keys"], [radosgwadmin_bin, "user", "rm", f"--uid={tenant}${username}", "--purge-data", "--purge-keys"],
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
check=False check=False
) )
proc = subprocess.run( proc = subprocess.run(
["/snap/bin/radosgw-admin", "user", "create", f"--uid={tenant}${username}", f"--display-name={tenant}_{username}"], [radosgwadmin_bin, "user", "create", f"--uid={tenant}${username}", f"--display-name={tenant}_{username}"],
check=True, check=True,
capture_output=True, capture_output=True,
text=True, text=True,
...@@ -74,7 +79,7 @@ def radosuser(microceph_url, username, tenant="tenant1"): ...@@ -74,7 +79,7 @@ def radosuser(microceph_url, username, tenant="tenant1"):
user = json.loads(proc.stdout) user = json.loads(proc.stdout)
yield StorageManager(microceph_url, user["keys"][0]["access_key"], user["keys"][0]["secret_key"]) yield StorageManager(microceph_url, user["keys"][0]["access_key"], user["keys"][0]["secret_key"])
subprocess.run(["/snap/bin/radosgw-admin", "user", "rm", f"--uid={tenant}${username}", "--purge-data", "--purge-keys"], check=True) subprocess.run([radosgwadmin_bin, "user", "rm", f"--uid={tenant}${username}", "--purge-data", "--purge-keys"], check=True)
@pytest.fixture @pytest.fixture
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment