fix tests (merged)

Author: Nissan Pow

test/data/s3/conftest.py

@@ -0,0 +1,36 @@
+import pytest
+from metaflow import current
+from .. import S3ROOT
+
+# S3ROOT variants for testing both with and without trailing slash
+S3ROOT_VARIANTS = [S3ROOT.rstrip("/"), S3ROOT if S3ROOT.endswith("/") else S3ROOT + "/"]
+
+
+@pytest.fixture(params=S3ROOT_VARIANTS, ids=["no_slash", "with_slash"])
+def s3root(request):
+    """
+    Fixture that provides S3ROOT with and without trailing slash.
+
+    This ensures tests work correctly regardless of whether the s3root
+    has a trailing slash or not.
+    """
+    return request.param
+
+
+@pytest.fixture(autouse=True)
+def reset_current_env():
+    """
+    Fixture to ensure the metaflow current environment is clean between tests.
+
+    This prevents test pollution when tests manipulate the global current state.
+    The fixture runs automatically for all tests in this directory.
+    """
+    # Setup: Save the current state (if any)
+    saved_state = getattr(current, "_flow", None)
+
+    yield
+
+    # Teardown: Reset current to initial state
+    # Clear any environment that was set during the test
+    if hasattr(current, "_flow"):
+        current._flow = saved_state

test/data/s3/s3_data.py

@@ -197,7 +197,7 @@ def data(self):
 
     @property
     def url(self):
-        return os.path.join(S3ROOT, self.key)
+        return self.key
 
 
 def _format_test_cases(dataset, meta=None, ranges=None):
@@ -485,11 +485,6 @@ def pytest_put_blobs_case(meta=None):
 
 def ensure_test_data():
     # update S3ROOT in __init__.py to get a fresh set of data
-    if S3ROOT is None:
-        print(
-            "S3ROOT is not set. Set METAFLOW_S3_TEST_ROOT environment variable to run S3 tests."
-        )
-        return
     print("Ensuring that test data exists at %s" % S3ROOT)
     mark = urlparse(os.path.join(S3ROOT, "ALL_OK"))
     try: