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, 54 insertions, 50 deletions

diff --git a/test/suite_dfilter/group_bytes_ipv6.py b/test/suite_dfilter/group_bytes_ipv6.py
index f2964a09a9..fd3b007294 100644
--- a/test/suite_dfilter/group_bytes_ipv6.py
+++ b/test/suite_dfilter/group_bytes_ipv6.py
@@ -2,103 +2,107 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-from suite_dfilter import dfiltertest
+import unittest
+import fixtures
+from suite_dfilter.dfiltertest import *
 
-class case_bytes_ipv6(dfiltertest.DFTestCase):
+
+@fixtures.uses_fixtures
+class case_bytes_ipv6(unittest.TestCase):
     trace_file = "ipv6.pcap"
 
-    def test_eq_1(self):
+    def test_eq_1(self, checkDFilterCount):
         dfilter = "ipv6.dst == ff05::9999"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_eq_2(self):
+    def test_eq_2(self, checkDFilterCount):
         dfilter = "ipv6.dst == ff05::9990"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_ne_1(self):
+    def test_ne_1(self, checkDFilterCount):
         dfilter = "ipv6.dst != ff05::9990"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_ne_2(self):
+    def test_ne_2(self, checkDFilterCount):
         dfilter = "ipv6.dst != ff05::9999"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_gt_1(self):
+    def test_gt_1(self, checkDFilterCount):
         dfilter = "ipv6.dst > ff05::0000"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_gt_2(self):
+    def test_gt_2(self, checkDFilterCount):
         dfilter = "ipv6.dst > ff05::9999"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_ge_1(self):
+    def test_ge_1(self, checkDFilterCount):
         dfilter = "ipv6.dst >= ff05::9999"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_ge_2(self):
+    def test_ge_2(self, checkDFilterCount):
         dfilter = "ipv6.dst >= ff05::a000"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_lt_1(self):
+    def test_lt_1(self, checkDFilterCount):
         dfilter = "ipv6.dst < ff05::a000"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_lt_2(self):
+    def test_lt_2(self, checkDFilterCount):
         dfilter = "ipv6.dst < ff05::9999"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_le_1(self):
+    def test_le_1(self, checkDFilterCount):
         dfilter = "ipv6.dst <= ff05::9999"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_le_2(self):
+    def test_le_2(self, checkDFilterCount):
         dfilter = "ipv6.dst <= ff05::9998"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_cidr_eq_1(self):
+    def test_cidr_eq_1(self, checkDFilterCount):
         dfilter = "ipv6.dst == ff05::9999/128"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_cidr_eq_2(self):
+    def test_cidr_eq_2(self, checkDFilterCount):
         dfilter = "ipv6.dst == ff05::0/64"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_cidr_eq_3(self):
+    def test_cidr_eq_3(self, checkDFilterCount):
         dfilter = "ipv6.dst == ff05::ffff/112"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_cidr_eq_4(self):
+    def test_cidr_eq_4(self, checkDFilterCount):
         dfilter = "ipv6.dst == ff04::0/64"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_cidr_ne_1(self):
+    def test_cidr_ne_1(self, checkDFilterCount):
         dfilter = "ipv6.dst != ff05::9999/128"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_cidr_ne_2(self):
+    def test_cidr_ne_2(self, checkDFilterCount):
         dfilter = "ipv6.dst != ff05::0/64"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_cidr_ne_3(self):
+    def test_cidr_ne_3(self, checkDFilterCount):
         dfilter = "ipv6.dst != ff05::ffff/112"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_cidr_ne_4(self):
+    def test_cidr_ne_4(self, checkDFilterCount):
         dfilter = "ipv6.dst != ff04::00/64"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_slice_1(self):
+    def test_slice_1(self, checkDFilterCount):
         dfilter = "ipv6.dst[14:2] == 99:99"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_slice_2(self):
+    def test_slice_2(self, checkDFilterCount):
         dfilter = "ipv6.dst[14:2] == 00:00"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_slice_3(self):
+    def test_slice_3(self, checkDFilterCount):
         dfilter = "ipv6.dst[15:1] == 99"
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_slice_4(self):
+    def test_slice_4(self, checkDFilterCount):
         dfilter = "ipv6.dst[15:1] == 00"
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)