test: convert suite_dfilter to use fixtures

Stop using subprocesstest, drop the (now redundant) DFTestCase base
class and use pytest-style fixtures to inject the dependency on tshark.
This approach makes it easier to switch to pytest in the future.
Most substitutions were automated, so no typos should be present.

Change-Id: I3516029162f87423816937410ff63507ff82e96f
Reviewed-on: https://code.wireshark.org/review/30649
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

1 files changed, 79 insertions, 75 deletions

diff --git a/test/suite_dfilter/group_integer.py b/test/suite_dfilter/group_integer.py
index 8d8196de19..1a6425e4ce 100644
--- a/test/suite_dfilter/group_integer.py
+++ b/test/suite_dfilter/group_integer.py
@@ -2,150 +2,154 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-from suite_dfilter import dfiltertest
+import unittest
+import fixtures
+from suite_dfilter.dfiltertest import *
 
-class case_integer(dfiltertest.DFTestCase):
+
+@fixtures.uses_fixtures
+class case_integer(unittest.TestCase):
     trace_file = "ntp.pcap"
 
-    def test_eq_1(self):
+    def test_eq_1(self, checkDFilterCount):
         dfilter = "ip.version == 4"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_eq_2(self):
+    def test_eq_2(self, checkDFilterCount):
         dfilter = "ip.version == 6"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_eq_3(self):
-	# Invalid filter (only one equals sign)
+    def test_eq_3(self, checkDFilterFail):
+        # Invalid filter (only one equals sign)
         dfilter = "ip.version = 4"
-        self.assertDFilterFail(dfilter)
+        checkDFilterFail(dfilter)
 
-    def test_eq_4(self):
-	# Invalid filter
+    def test_eq_4(self, checkDFilterFail):
+        # Invalid filter
         dfilter = "ip.version == the quick brown fox jumps over the lazy dog"
-        self.assertDFilterFail(dfilter)
+        checkDFilterFail(dfilter)
 
-    def test_eq_5(self):
-	# Invalid filter
+    def test_eq_5(self, checkDFilterFail):
+        # Invalid filter
         dfilter = "ip.version == 4 the quick brown fox jumps over the lazy dog"
-        self.assertDFilterFail(dfilter)
+        checkDFilterFail(dfilter)
 
-    def test_ne_1(self):
+    def test_ne_1(self, checkDFilterCount):
         dfilter = "ip.version != 0"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_ne_2(self):
+    def test_ne_2(self, checkDFilterCount):
         dfilter = "ip.version != 4"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_u_gt_1(self):
+    def test_u_gt_1(self, checkDFilterCount):
         dfilter = "ip.version > 3"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_u_gt_2(self):
+    def test_u_gt_2(self, checkDFilterCount):
         dfilter = "ip.version > 4"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_u_gt_3(self):
+    def test_u_gt_3(self, checkDFilterCount):
         dfilter = "ip.version > 5"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_u_ge_1(self):
+    def test_u_ge_1(self, checkDFilterCount):
         dfilter = "ip.version >= 3"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_u_ge_2(self):
+    def test_u_ge_2(self, checkDFilterCount):
         dfilter = "ip.version >= 4"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_u_ge_3(self):
+    def test_u_ge_3(self, checkDFilterCount):
         dfilter = "ip.version >= 5"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_u_lt_1(self):
+    def test_u_lt_1(self, checkDFilterCount):
         dfilter = "ip.version < 3"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_u_lt_2(self):
+    def test_u_lt_2(self, checkDFilterCount):
         dfilter = "ip.version < 4"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_u_lt_3(self):
+    def test_u_lt_3(self, checkDFilterCount):
         dfilter = "ip.version < 5"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_u_le_1(self):
+    def test_u_le_1(self, checkDFilterCount):
         dfilter = "ip.version <= 3"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_u_le_2(self):
+    def test_u_le_2(self, checkDFilterCount):
         dfilter = "ip.version <= 4"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_u_le_3(self):
+    def test_u_le_3(self, checkDFilterCount):
         dfilter = "ip.version <= 5"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_s_gt_1(self):
+    def test_s_gt_1(self, checkDFilterCount):
         dfilter = "ntp.precision > 244"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_s_gt_2(self):
+    def test_s_gt_2(self, checkDFilterCount):
         dfilter = "ntp.precision > 245"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_s_gt_3(self):
+    def test_s_gt_3(self, checkDFilterCount):
         dfilter = "ntp.precision > 246"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_s_ge_1(self):
+    def test_s_ge_1(self, checkDFilterCount):
         dfilter = "ntp.precision >= 244"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_s_ge_2(self):
+    def test_s_ge_2(self, checkDFilterCount):
         dfilter = "ntp.precision >= 245"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_s_ge_3(self):
+    def test_s_ge_3(self, checkDFilterCount):
         dfilter = "ntp.precision >= 246"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_s_lt_1(self):
+    def test_s_lt_1(self, checkDFilterCount):
         dfilter = "ntp.precision < 244"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_s_lt_2(self):
+    def test_s_lt_2(self, checkDFilterCount):
         dfilter = "ntp.precision < 245"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_s_lt_3(self):
+    def test_s_lt_3(self, checkDFilterCount):
         dfilter = "ntp.precision < 246"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_s_le_1(self):
+    def test_s_le_1(self, checkDFilterCount):
         dfilter = "ntp.precision <= 244"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_s_le_2(self):
+    def test_s_le_2(self, checkDFilterCount):
         dfilter = "ntp.precision <= 245"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_s_le_3(self):
+    def test_s_le_3(self, checkDFilterCount):
         dfilter = "ntp.precision <= 246"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_bool_eq_1(self):
+    def test_bool_eq_1(self, checkDFilterCount):
         dfilter = "ip.flags.df == 0"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_bool_eq_2(self):
+    def test_bool_eq_2(self, checkDFilterCount):
         dfilter = "ip.flags.df == 1"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_bool_ne_1(self):
+    def test_bool_ne_1(self, checkDFilterCount):
         dfilter = "ip.flags.df != 1"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_bool_ne_2(self):
+    def test_bool_ne_2(self, checkDFilterCount):
         dfilter = "ip.flags.df != 0"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)