From afd4cc3b87d09ce327488f5975197e7be81dfb6a Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 15 Jun 2026 09:26:17 +0100
Subject: [PATCH] .

---
 conftest.py                | 23 +++++++++++++++++++++++
 media_test/tmpam34uuxi.jpg |  0
 media_test/tmpn6geswcc.jpg |  0
 media_test/tmpqmjkbq5c.jpg |  0
 rad/settings_test.py       |  2 +-
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 conftest.py
 delete mode 100644 media_test/tmpam34uuxi.jpg
 delete mode 100644 media_test/tmpn6geswcc.jpg
 delete mode 100644 media_test/tmpqmjkbq5c.jpg

diff --git a/conftest.py b/conftest.py
new file mode 100644
index 00000000..0b521281
--- /dev/null
+++ b/conftest.py
@@ -0,0 +1,23 @@
+import os
+import shutil
+import pytest
+from django.conf import settings
+
+@pytest.fixture(scope="session", autouse=True)
+def cleanup_test_media():
+    """
+    Session-scoped fixture to automatically clean up temporary media files
+    generated during the test run.
+    """
+    yield
+    # Clean up settings.MEDIA_ROOT
+    media_root = getattr(settings, "MEDIA_ROOT", None)
+    if media_root and os.path.exists(media_root) and "media_test" in media_root:
+        shutil.rmtree(media_root, ignore_errors=True)
+
+    # Also clean up any legacy directories created due to missing trailing slash
+    base_dir = getattr(settings, "BASE_DIR", None)
+    if base_dir:
+        legacy_dir = os.path.join(base_dir, "media_testlongs")
+        if os.path.exists(legacy_dir):
+            shutil.rmtree(legacy_dir, ignore_errors=True)
diff --git a/media_test/tmpam34uuxi.jpg b/media_test/tmpam34uuxi.jpg
deleted file mode 100644
index e69de29b..00000000
diff --git a/media_test/tmpn6geswcc.jpg b/media_test/tmpn6geswcc.jpg
deleted file mode 100644
index e69de29b..00000000
diff --git a/media_test/tmpqmjkbq5c.jpg b/media_test/tmpqmjkbq5c.jpg
deleted file mode 100644
index e69de29b..00000000
diff --git a/rad/settings_test.py b/rad/settings_test.py
index 605aa94f..34f92cf2 100644
--- a/rad/settings_test.py
+++ b/rad/settings_test.py
@@ -33,6 +33,6 @@ TASKS = {
 }
 
 # Local media root for tests to avoid container-only paths in settings_local
-MEDIA_ROOT = os.path.join(BASE_DIR, "media_test")
+MEDIA_ROOT = os.path.join(BASE_DIR, "media_test") + "/"
 os.makedirs(MEDIA_ROOT, exist_ok=True)