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, 32 insertions, 30 deletions

diff --git a/test/suite_dfilter/group_double.py b/test/suite_dfilter/group_double.py
index 4275a712be..8ceeb0df91 100644
--- a/test/suite_dfilter/group_double.py
+++ b/test/suite_dfilter/group_double.py
@@ -3,65 +3,67 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 import unittest
+import fixtures
+from suite_dfilter.dfiltertest import *
 
-from suite_dfilter import dfiltertest
 
-class case_double(dfiltertest.DFTestCase):
+@fixtures.uses_fixtures
+class case_double(unittest.TestCase):
 
     trace_file = "icmp.pcapng.gz"
 
-    def test_eq_1(self):
+    def test_eq_1(self, checkDFilterCount):
         dfilter = "icmp.resptime == 492.204"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_eq_2(self):
+    def test_eq_2(self, checkDFilterCount):
         dfilter = "icmp.resptime == 492.205"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_gt_1(self):
+    def test_gt_1(self, checkDFilterCount):
         dfilter = "icmp.resptime > 492"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_gt_2(self):
+    def test_gt_2(self, checkDFilterCount):
         dfilter = "icmp.resptime > 492.203"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_gt_3(self):
+    def test_gt_3(self, checkDFilterCount):
         dfilter = "icmp.resptime > 493"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_ge_1(self):
+    def test_ge_1(self, checkDFilterCount):
         dfilter = "icmp.resptime >= 493"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_ge_2(self):
+    def test_ge_2(self, checkDFilterCount):
         dfilter = "icmp.resptime >= 492"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_ge_3(self):
+    def test_ge_3(self, checkDFilterCount):
         dfilter = "icmp.resptime >= 492.204"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_lt_1(self):
+    def test_lt_1(self, checkDFilterCount):
         dfilter = "icmp.resptime < 493"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_lt_2(self):
+    def test_lt_2(self, checkDFilterCount):
         dfilter = "icmp.resptime < 492"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_lt_3(self):
+    def test_lt_3(self, checkDFilterCount):
         dfilter = "icmp.resptime < 492.204"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_le_1(self):
+    def test_le_1(self, checkDFilterCount):
         dfilter = "icmp.resptime <= 492.204"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_le_2(self):
+    def test_le_2(self, checkDFilterCount):
         dfilter = "icmp.resptime <= 493"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_le_3(self):
+    def test_le_3(self, checkDFilterCount):
         dfilter = "icmp.resptime <= 492"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)