Cleanup

canonical · Mar 28, 2024 · 44759e3 · 44759e3
1 parent 575f94e
commit 44759e3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/tests/e2e/conftest.py b/tests/e2e/conftest.py
@@ -20,10 +20,9 @@ def get_this_script_dir() -> Path:
 
 @pytest.fixture(scope="module")
 async def rendered_bundle() -> Path:
-    """Returns the pathlib.Path for the rendered bundle file."""
-    # If a bundle.yaml file already exists, use it (do no render anything).
-    user_bundle = get_this_script_dir() / ".." / ".." / "bundle.yaml"
-    if not user_bundle.exists():
+    """Returns the pathlib.Path for the bundle file."""
+    bundle = get_this_script_dir() / ".." / ".." / "bundle.yaml"
+    if not bundle.exists():
         raise FileNotFoundError("Expected a 'bundle.yaml' to be present")
 
-    return user_bundle
+    return bundle
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -30,10 +30,9 @@ async def setup_env(ops_test: OpsTest):
 
 @pytest.fixture(scope="module")
 async def rendered_bundle() -> Path:
-    """Returns the pathlib.Path for the rendered bundle file."""
-    # If a bundle.yaml file already exists, use it (do no render anything).
-    user_bundle = get_this_script_dir() / ".." / ".." / "bundle.yaml"
-    if not user_bundle.exists():
+    """Returns the pathlib.Path for the bundle file."""
+    bundle = get_this_script_dir() / ".." / ".." / "bundle.yaml"
+    if not bundle.exists():
         raise FileNotFoundError("Expected a 'bundle.yaml' to be present")
 
-    return user_bundle
+    return bundle