From 8c5aaaabd1b3096201e89fe28125a406921512f8 Mon Sep 17 00:00:00 2001
From: Matthias Mair <code@mjmair.com>
Date: Sat, 18 Oct 2025 21:50:29 +0200
Subject: [PATCH] make check and test more robust

---
 src/backend/InvenTree/InvenTree/mixins.py           | 6 ++++--
 src/backend/InvenTree/InvenTree/test_serializers.py | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/backend/InvenTree/InvenTree/mixins.py b/src/backend/InvenTree/InvenTree/mixins.py
index cd5f492175..d879ddcc43 100644
--- a/src/backend/InvenTree/InvenTree/mixins.py
+++ b/src/backend/InvenTree/InvenTree/mixins.py
@@ -227,8 +227,10 @@ class OutputOptionsMixin:
         super().__init__()
 
         # Check that the serializer was defined
-        if hasattr(self, 'serializer_class') and (
-            not issubclass(self.serializer_class, FilterableSerializerMixin)
+        if (
+            hasattr(self, 'serializer_class')
+            and isinstance(self.serializer_class, type)
+            and (not issubclass(self.serializer_class, FilterableSerializerMixin))
         ):
             raise Exception(
                 'INVE-I2: `OutputOptionsMixin` can only be used with serializers that contain the `FilterableSerializerMixin` mixin'
diff --git a/src/backend/InvenTree/InvenTree/test_serializers.py b/src/backend/InvenTree/InvenTree/test_serializers.py
index f04cf6e075..9fc5babd6e 100644
--- a/src/backend/InvenTree/InvenTree/test_serializers.py
+++ b/src/backend/InvenTree/InvenTree/test_serializers.py
@@ -191,6 +191,9 @@ class FilteredSerializers(InvenTreeAPITestCase):
 
             view = BadList()
             self.assertTrue(True)
+            # mock some stuff to allow get_serializer to run
+            view.request = self.client.request()
+            view.format_kwarg = {}
             view.get_serializer()  # this should raise an exception
 
         self.assertEqual(