Remove dnsdist specific tests that remained

diff --git a/regression-tests.auth-py/test_Carbon.py b/regression-tests.auth-py/test_Carbon.py
index b7fbaa287b711e914eef7266e5cae68f3f72df34..6718b15ad5ca3c8ddc9ca75d98d1a99cf8f4cbe3 100644 (file)
--- a/regression-tests.auth-py/test_Carbon.py
+++ b/regression-tests.auth-py/test_Carbon.py
@@ -113,63 +113,3 @@ class TestCarbon(AuthTest):
             value = self._carbonCounters[key]
             self.assertTrue(value >= 1)
 
-    def testCarbonServerUp(self):
-        """
-        Carbon: set up 2 carbon servers
-        """
-        # wait for the carbon data to be sent
-        time.sleep(self._carbonInterval + 1)
-
-        # check if the servers have received our data
-        # we will block for a short while if the data is not already there,
-        # and an exception will be raised after the timeout
-        # first server
-        data1 = self._carbonQueue1.get(block=True, timeout=2.0)
-        # second server
-        data2 = self._carbonQueue2.get(block=True, timeout=2.0)
-        after = time.time()
-
-        # check the first carbon server got both servers and
-        # servers-up metrics and that they are the same as
-        # configured in the class definition
-        self.assertTrue(data1)
-        self.assertTrue(len(data1.splitlines()) > 1)
-        expectedStart = b"dnsdist.%s.main.pools._default_.servers" % self._carbonServerName.encode('UTF-8')
-        for line in data1.splitlines():
-            if expectedStart in line:
-                parts = line.split(b' ')
-                if b'servers-up' in line:
-                    self.assertEqual(len(parts), 3)
-                    self.assertTrue(parts[1].isdigit())
-                    self.assertEqual(int(parts[1]), 2)
-                    self.assertTrue(parts[2].isdigit())
-                    self.assertTrue(int(parts[2]) <= int(after))
-                else:
-                    self.assertEqual(len(parts), 3)
-                    self.assertTrue(parts[1].isdigit())
-                    self.assertEqual(int(parts[1]), 3)
-                    self.assertTrue(parts[2].isdigit())
-                    self.assertTrue(int(parts[2]) <= int(after))
-
-        # check the second carbon server got both servers and
-        # servers-up metrics and that they are the same as
-        # configured in the class definition and the same as
-        # the first carbon server
-        self.assertTrue(data2)
-        self.assertTrue(len(data2.splitlines()) > 1)
-        expectedStart = b"dnsdist.%s.main.pools._default_.servers" % self._carbonServerName.encode('UTF-8')
-        for line in data2.splitlines():
-            if expectedStart in line:
-                parts = line.split(b' ')
-                if b'servers-up' in line:
-                    self.assertEqual(len(parts), 3)
-                    self.assertTrue(parts[1].isdigit())
-                    self.assertEqual(int(parts[1]), 2)
-                    self.assertTrue(parts[2].isdigit())
-                    self.assertTrue(int(parts[2]) <= int(after))
-                else:
-                    self.assertEqual(len(parts), 3)
-                    self.assertTrue(parts[1].isdigit())
-                    self.assertEqual(int(parts[1]), 3)
-                    self.assertTrue(parts[2].isdigit())
-                    self.assertTrue(int(parts[2]) <= int(after))

diff --git a/regression-tests.recursor-dnssec/test_Carbon.py b/regression-tests.recursor-dnssec/test_Carbon.py
index 54033784e51bfd1718ece8281383308f35454a7c..83a70d7acfaf0a742066d6febd815d12f620b22e 100644 (file)
--- a/regression-tests.recursor-dnssec/test_Carbon.py
+++ b/regression-tests.recursor-dnssec/test_Carbon.py
@@ -129,63 +129,3 @@ class TestCarbon(RecursorTest):
             value = self._carbonCounters[key]
             self.assertTrue(value >= 1)
 
-    def testCarbonServerUp(self):
-        """
-        Carbon: set up 2 carbon servers
-        """
-        # wait for the carbon data to be sent
-        time.sleep(self._carbonInterval + 1)
-
-        # check if the servers have received our data
-        # we will block for a short while if the data is not already there,
-        # and an exception will be raised after the timeout
-        # first server
-        data1 = self._carbonQueue1.get(block=True, timeout=2.0)
-        # second server
-        data2 = self._carbonQueue2.get(block=True, timeout=2.0)
-        after = time.time()
-
-        # check the first carbon server got both servers and
-        # servers-up metrics and that they are the same as
-        # configured in the class definition
-        self.assertTrue(data1)
-        self.assertTrue(len(data1.splitlines()) > 1)
-        expectedStart = b"dnsdist.%s.main.pools._default_.servers" % self._carbonServerName.encode('UTF-8')
-        for line in data1.splitlines():
-            if expectedStart in line:
-                parts = line.split(b' ')
-                if b'servers-up' in line:
-                    self.assertEqual(len(parts), 3)
-                    self.assertTrue(parts[1].isdigit())
-                    self.assertEqual(int(parts[1]), 2)
-                    self.assertTrue(parts[2].isdigit())
-                    self.assertTrue(int(parts[2]) <= int(after))
-                else:
-                    self.assertEqual(len(parts), 3)
-                    self.assertTrue(parts[1].isdigit())
-                    self.assertEqual(int(parts[1]), 3)
-                    self.assertTrue(parts[2].isdigit())
-                    self.assertTrue(int(parts[2]) <= int(after))
-
-        # check the second carbon server got both servers and
-        # servers-up metrics and that they are the same as
-        # configured in the class definition and the same as
-        # the first carbon server
-        self.assertTrue(data2)
-        self.assertTrue(len(data2.splitlines()) > 1)
-        expectedStart = b"dnsdist.%s.main.pools._default_.servers" % self._carbonServerName.encode('UTF-8')
-        for line in data2.splitlines():
-            if expectedStart in line:
-                parts = line.split(b' ')
-                if b'servers-up' in line:
-                    self.assertEqual(len(parts), 3)
-                    self.assertTrue(parts[1].isdigit())
-                    self.assertEqual(int(parts[1]), 2)
-                    self.assertTrue(parts[2].isdigit())
-                    self.assertTrue(int(parts[2]) <= int(after))
-                else:
-                    self.assertEqual(len(parts), 3)
-                    self.assertTrue(parts[1].isdigit())
-                    self.assertEqual(int(parts[1]), 3)
-                    self.assertTrue(parts[2].isdigit())
-                    self.assertTrue(int(parts[2]) <= int(after))