1 files changed, 27 insertions, 24 deletions
diff --git a/test/suite_dfilter/group_tvb.py b/test/suite_dfilter/group_tvb.py
index e257de1a4d..bf47b5faa9 100644
--- a/test/suite_dfilter/group_tvb.py
+++ b/test/suite_dfilter/group_tvb.py
@@ -2,59 +2,62 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-from suite_dfilter import dfiltertest
 import unittest
+import fixtures
+from suite_dfilter.dfiltertest import *
 
-class case_tvb(dfiltertest.DFTestCase):
+
+@fixtures.uses_fixtures
+class case_tvb(unittest.TestCase):
     trace_file = "http.pcap"
 
-    def test_eq_1(self):
+    def test_eq_1(self, checkDFilterCount):
         # We expect 0 because even though this byte
         # string matches the 'eth' protocol, protocols cannot
         # work in an '==' comparison yet.
         dfilter = "eth == 00:e0:81:00:b0:28:00:09:6b:88:f6:c9:08:00"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_slice_1(self):
+    def test_slice_1(self, checkDFilterCount):
         dfilter = "ip[0:2] == 45:00"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_slice_2(self):
+    def test_slice_2(self, checkDFilterCount):
         dfilter = "ip[0:2] == 00:00"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_slice_3(self):
+    def test_slice_3(self, checkDFilterCount):
         dfilter = "ip[2:2] == 00:c1"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
     @unittest.skip("This doesn't work yet in Wireshark")
-    def test_slice_4(self):
+    def test_slice_4(self, checkDFilterCount):
         dfilter = "ip[-5] == 0x86"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
     @unittest.skip("This doesn't work yet in Wireshark")
-    def test_slice_5(self):
+    def test_slice_5(self, checkDFilterCount):
         dfilter = "ip[-1] == 0x86"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_contains_1(self):
+    def test_contains_1(self, checkDFilterCount):
         dfilter = "eth contains 6b"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_contains_2(self):
+    def test_contains_2(self, checkDFilterCount):
         dfilter = "eth contains 09:6b:88"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_contains_3(self):
+    def test_contains_3(self, checkDFilterCount):
         dfilter = "eth contains 00:e0:81:00:b0:28:00:09:6b:88:f5:c9:08:00"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_contains_4(self):
+    def test_contains_4(self, checkDFilterCount):
         dfilter = "eth contains ff:ff:ff"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_contains_5(self):
+    def test_contains_5(self, checkDFilterCount):
         dfilter = 'http contains "HEAD"'
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)