Refactor tests to use available recControl() method

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/regression-tests.recursor-dnssec/test_ForwardOverDoT.py b/regression-tests.recursor-dnssec/test_ForwardOverDoT.py
index 42fbd07c5b6f615041af31ad742bfa5e910bf279..3211e4c8f63a08106b18ff5e79f517171aa98839 100644 (file)
--- a/regression-tests.recursor-dnssec/test_ForwardOverDoT.py
+++ b/regression-tests.recursor-dnssec/test_ForwardOverDoT.py
@@ -28,28 +28,13 @@ devonly-regression-test-mode
         self.assertRRsetInAnswer(res, expected)
         self.assertMatchingRRSIGInAnswer(res, expected)
 
-        rec_controlCmd = [os.environ['RECCONTROL'],
-                          '--config-dir=%s' % 'configs/' + self._confdir,
-                          'get dot-outqueries']
-        try:
-            ret = subprocess.check_output(rec_controlCmd, stderr=subprocess.STDOUT)
-            self.assertNotEqual(ret, b'UNKNOWN\n')
-            self.assertNotEqual(ret, b'0\n')
-
-        except subprocess.CalledProcessError as e:
-            print(e.output)
-            raise
-
-        rec_controlCmd = [os.environ['RECCONTROL'],
-                          '--config-dir=%s' % 'configs/' + self._confdir,
-                          'get tcp-outqueries']
-        try:
-            ret = subprocess.check_output(rec_controlCmd, stderr=subprocess.STDOUT)
-            self.assertEqual(ret, b'0\n')
-
-        except subprocess.CalledProcessError as e:
-            print(e.output)
-            raise
+        confdir = 'configs/' + self._confdir
+        ret = self.recControl(confdir, 'get', 'dot-outqueries')
+        self.assertNotEqual(ret, 'UNKNOWN\n')
+        self.assertNotEqual(ret, '0\n')
+
+        ret = self.recControl(confdir, 'get', 'tcp-outqueries')
+        self.assertEqual(ret, '0\n')
 
 class ForwardOverDoTTest(RecursorTest):
     """
@@ -94,26 +79,11 @@ recursor:
         self.assertRRsetInAnswer(res, expected)
         self.assertMatchingRRSIGInAnswer(res, expected)
 
-        rec_controlCmd = [os.environ['RECCONTROL'],
-                          '--config-dir=%s' % 'configs/' + self._confdir,
-                          'get dot-outqueries']
-        try:
-            ret = subprocess.check_output(rec_controlCmd, stderr=subprocess.STDOUT)
-            self.assertNotEqual(ret, b'UNKNOWN\n')
-            self.assertNotEqual(ret, b'0\n')
-
-        except subprocess.CalledProcessError as e:
-            print(e.output)
-            raise
-
-        rec_controlCmd = [os.environ['RECCONTROL'],
-                          '--config-dir=%s' % 'configs/' + self._confdir,
-                          'get tcp-outqueries']
-        try:
-            ret = subprocess.check_output(rec_controlCmd, stderr=subprocess.STDOUT)
-            self.assertEqual(ret, b'0\n')
-
-        except subprocess.CalledProcessError as e:
-            print(e.output)
-            raise
+        confdir = 'configs/' + self._confdir
+        ret = self.recControl(confdir, 'get', 'dot-outqueries')
+        self.assertNotEqual(ret, 'UNKNOWN\n')
+        self.assertNotEqual(ret, '0\n')
+
+        ret = self.recControl(confdir, 'get', 'tcp-outqueries')
+        self.assertEqual(ret, '0\n')