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, 18 insertions, 14 deletions

diff --git a/test/suite_dfilter/group_scanner.py b/test/suite_dfilter/group_scanner.py
index 7ad1b5449c..4144a0fe27 100644
--- a/test/suite_dfilter/group_scanner.py
+++ b/test/suite_dfilter/group_scanner.py
@@ -2,31 +2,35 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-from suite_dfilter import dfiltertest
+import unittest
+import fixtures
+from suite_dfilter.dfiltertest import *
 
-class case_scanner(dfiltertest.DFTestCase):
+
+@fixtures.uses_fixtures
+class case_scanner(unittest.TestCase):
     trace_file = "http.pcap"
 
-    def test_dquote_1(self):
+    def test_dquote_1(self, checkDFilterCount):
         dfilter = 'http.request.method == "HEAD"'
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_dquote_2(self):
+    def test_dquote_2(self, checkDFilterCount):
         dfilter = 'http.request.method == "\\x48EAD"'
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_dquote_3(self):
+    def test_dquote_3(self, checkDFilterCount):
         dfilter = 'http.request.method == "\\x58EAD"'
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_dquote_4(self):
+    def test_dquote_4(self, checkDFilterCount):
         dfilter = 'http.request.method == "\\110EAD"'
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)
 
-    def test_dquote_5(self):
+    def test_dquote_5(self, checkDFilterCount):
         dfilter = 'http.request.method == "\\111EAD"'
-        self.assertDFilterCount(dfilter, 0)
+        checkDFilterCount(dfilter, 0)
 
-    def test_dquote_6(self):
+    def test_dquote_6(self, checkDFilterCount):
         dfilter = 'http.request.method == "\\HEAD"'
-        self.assertDFilterCount(dfilter, 1)
+        checkDFilterCount(dfilter, 1)