From 6b2e13bcb02721899dcc495279238fa3c8d42018 Mon Sep 17 00:00:00 2001
From: YC Yen-Ching Tseng <yctseng@amd.com>
Date: Thu, 10 Sep 2026 09:07:08 +0200
Subject: [PATCH] [AMD] Fix the diffusion perf fixture lookup  (#38686)

---
 test/registered/amd/conftest.py           | 10 ++++++++++
 test/registered/amd/test_wan22_fp8_mla.py |  7 -------
 test/registered/amd/test_zimage_turbo.py  |  7 -------
 3 files changed, 10 insertions(+), 14 deletions(-)
 create mode 100644 test/registered/amd/conftest.py

diff --git a/test/registered/amd/conftest.py b/test/registered/amd/conftest.py
new file mode 100644
index 000000000..86ca45ff1
--- /dev/null
+++ b/test/registered/amd/conftest.py
@@ -0,0 +1,10 @@
+"""Make the diffusion perf fixture reachable from this directory.
+
+``DiffusionServerBase`` (subclassed by the diffusion tests here) has an autouse
+fixture that requests ``perf_results``, which is declared in
+``sglang/multimodal_gen/test/server/conftest.py``. pytest resolves conftest.py
+by the collected file's directory, so that declaration never reaches
+``test/registered/``; re-exporting it here is what makes it resolvable.
+"""
+
+from sglang.multimodal_gen.test.server.conftest import perf_results  # noqa: F401
diff --git a/test/registered/amd/test_wan22_fp8_mla.py b/test/registered/amd/test_wan22_fp8_mla.py
index 7bbfd82a4..cfe2e0852 100644
--- a/test/registered/amd/test_wan22_fp8_mla.py
+++ b/test/registered/amd/test_wan22_fp8_mla.py
@@ -101,13 +101,6 @@ FP8_MLA_CASES = [
 class TestWan22FP8MLA(DiffusionServerBase):
     """AMD test for FP8 MLA attention on Wan2.2-T2V-A14B."""
 
-    @classmethod
-    def teardown_class(cls):
-        try:
-            super().teardown_class()
-        except AttributeError:
-            pass
-
     @pytest.fixture(params=FP8_MLA_CASES, ids=lambda c: c.id)
     def case(self, request) -> DiffusionTestCase:
         return request.param
diff --git a/test/registered/amd/test_zimage_turbo.py b/test/registered/amd/test_zimage_turbo.py
index 2a1481b3c..7ccf32f87 100644
--- a/test/registered/amd/test_zimage_turbo.py
+++ b/test/registered/amd/test_zimage_turbo.py
@@ -106,13 +106,6 @@ def _compute_clip_score(image_bytes: bytes, prompt: str) -> float | None:
 class TestZImageTurboAMD(DiffusionServerBase):
     """AMD nightly test for Z-Image-Turbo text-to-image generation."""
 
-    @classmethod
-    def teardown_class(cls):
-        try:
-            super().teardown_class()
-        except AttributeError:
-            pass
-
     @pytest.fixture(params=AMD_ZIMAGE_CASES, ids=lambda c: c.id)
     def case(self, request) -> DiffusionTestCase:
         return request.param