Merge pull request #8787 from rgacogne/ddist-tls-key-log-file

[thirdparty/pdns.git] / regression-tests.dnsdist / test_SNMP.py

diff --git a/regression-tests.dnsdist/test_SNMP.py b/regression-tests.dnsdist/test_SNMP.py
index 014b675a675492f2338ff6681b06711ac95ea7bb..14c86cb00e938a6bbb29289c651c939675ac8067 100644 (file)
--- a/regression-tests.dnsdist/test_SNMP.py
+++ b/regression-tests.dnsdist/test_SNMP.py
@@ -22,7 +22,7 @@ class TestSNMP(DNSDistTest):
     """
 
     def _checkStatsValues(self, results, queriesCountersValue):
-        for i in range(1, 20) + range(24, 35) + [ 35 ] :
+        for i in list(range(1, 5)) + list(range(6, 20)) + list(range(24, 35)) + [ 35 ] :
             oid = self._snmpOID + '.1.' + str(i) + '.0'
             self.assertTrue(oid in results)
             self.assertTrue(isinstance(results[oid], Counter64))
@@ -42,7 +42,7 @@ class TestSNMP(DNSDistTest):
             self.assertEquals(results[oid], queriesCountersValue)
 
         # the others counters (except for latency ones) should still be at 0
-        for i in range(3, 14) + [26, 27, 29, 30, 31, 35, 36]:
+        for i in [3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 26, 27, 29, 30, 31, 35, 36]:
             oid = self._snmpOID + '.1.' + str(i) + '.0'
             self.assertEquals(results[oid], 0)
 
@@ -58,7 +58,7 @@ class TestSNMP(DNSDistTest):
             self.assertTrue(isinstance(results[oid], OctetString))
 
         ## name
-        self.assertEquals(results['1.3.6.1.4.1.43315.3.2.1.2.0'], "servername")
+        self.assertEquals(str(results['1.3.6.1.4.1.43315.3.2.1.2.0']), "servername")
         ## weight
         self.assertEquals(results['1.3.6.1.4.1.43315.3.2.1.4.0'], 1)
         ## outstanding
@@ -68,11 +68,11 @@ class TestSNMP(DNSDistTest):
         ## reused
         self.assertEquals(results['1.3.6.1.4.1.43315.3.2.1.7.0'], 0)
         ## state
-        self.assertEquals(results['1.3.6.1.4.1.43315.3.2.1.8.0'], "up")
+        self.assertEquals(str(results['1.3.6.1.4.1.43315.3.2.1.8.0']), "up")
         ## address
-        self.assertEquals(results['1.3.6.1.4.1.43315.3.2.1.9.0'], ("127.0.0.1:%s" % (self._testServerPort)))
+        self.assertEquals(str(results['1.3.6.1.4.1.43315.3.2.1.9.0']), ("127.0.0.1:%s" % (self._testServerPort)))
         ## pools
-        self.assertEquals(results['1.3.6.1.4.1.43315.3.2.1.10.0'], "")
+        self.assertEquals(str(results['1.3.6.1.4.1.43315.3.2.1.10.0']), "")
         ## queries
         self.assertEquals(results['1.3.6.1.4.1.43315.3.2.1.12.0'], queriesCountersValue)
         ## order