From: Otto Moerbeek <otto@drijf.net>
Date: Mon, 21 Nov 2022 19:34:29 +0000 (+0100)
Subject: Value in test_Carbon can also be float
X-Git-Tag: dnsdist-1.8.0-rc1~229^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=554c7feb081fddeb989da1d0266b57f613a7306f;p=thirdparty%2Fpdns.git

Value in test_Carbon can also be float
---

diff --git a/regression-tests.dnsdist/test_Carbon.py b/regression-tests.dnsdist/test_Carbon.py
index cd8535114d..4d26c54a3c 100644
--- a/regression-tests.dnsdist/test_Carbon.py
+++ b/regression-tests.dnsdist/test_Carbon.py
@@ -7,7 +7,6 @@ from dnsdisttests import DNSDistTest, Queue
 
 class TestCarbon(DNSDistTest):
 
-    _extraStartupSleep = 2
     _carbonServer1Port = 8000
     _carbonServer1Name = "carbonname1"
     _carbonServer2Port = 8001
@@ -72,6 +71,13 @@ class TestCarbon(DNSDistTest):
         cls._CarbonResponder2.setDaemon(True)
         cls._CarbonResponder2.start()
 
+    def isfloat(self, num):
+        try:
+            float(num)
+            return True
+        except ValueError:
+            return False
+
     def testCarbon(self):
         """
         Carbon: send data to 2 carbon servers
@@ -92,11 +98,10 @@ class TestCarbon(DNSDistTest):
         self.assertTrue(len(data1.splitlines()) > 1)
         expectedStart = b"dnsdist.%s.main." % self._carbonServer1Name.encode('UTF-8')
         for line in data1.splitlines():
-            print(line, file=sys.stderr)
             self.assertTrue(line.startswith(expectedStart))
             parts = line.split(b' ')
             self.assertEqual(len(parts), 3)
-            self.assertTrue(parts[1].isdigit())
+            self.assertTrue(self.isfloat(parts[1]))
             self.assertTrue(parts[2].isdigit())
             self.assertTrue(int(parts[2]) <= int(after))
 
@@ -104,11 +109,10 @@ class TestCarbon(DNSDistTest):
         self.assertTrue(len(data2.splitlines()) > 1)
         expectedStart = b"dnsdist.%s.main." % self._carbonServer2Name.encode('UTF-8')
         for line in data2.splitlines():
-            print(line, file=sys.stderr)
             self.assertTrue(line.startswith(expectedStart))
             parts = line.split(b' ')
             self.assertEqual(len(parts), 3)
-            self.assertTrue(parts[1].isdigit())
+            self.assertTrue(self.isfloat(parts[1]))
             self.assertTrue(parts[2].isdigit())
             self.assertTrue(int(parts[2]) <= int(after))