Merge pull request #14195 from rgacogne/ddist-no-assertions

[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 f177a6f9fd753c3b33613961921b04148b3e48a3..b7738f3302d5d53287ab646274e9614101a3cdfa 100644 (file)
--- a/regression-tests.dnsdist/test_SNMP.py
+++ b/regression-tests.dnsdist/test_SNMP.py
@@ -6,7 +6,8 @@ from pysnmp.hlapi import *
 from dnsdisttests import DNSDistTest
 
 class TestSNMP(DNSDistTest):
-
+    # wait 1s so that the uptime is > 0
+    _extraStartupSleep = 1
     _snmpTimeout = 2.0
     _snmpServer = '127.0.0.1'
     _snmpPort = 161
@@ -19,7 +20,9 @@ class TestSNMP(DNSDistTest):
     _config_template = """
     newServer{address="127.0.0.1:%s", name="servername"}
     snmpAgent(true)
+    setVerboseHealthChecks(true)
     """
+    _verboseMode = True
 
     def _checkStatsValues(self, results, queriesCountersValue):
         for i in list(range(1, 5)) + list(range(6, 20)) + list(range(24, 35)) + [ 35 ] :
@@ -39,12 +42,12 @@ class TestSNMP(DNSDistTest):
         # check that the queries, responses and rdQueries counters are now at queriesCountersValue
         for i in [1, 2, 28]:
             oid = self._snmpOID + '.1.' + str(i) + '.0'
-            self.assertEquals(results[oid], queriesCountersValue)
+            self.assertEqual(results[oid], queriesCountersValue)
 
         # the others counters (except for latency ones) should still be at 0
         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)
+            self.assertEqual(results[oid], 0)
 
         # check the backend stats
         print(results)
@@ -58,25 +61,25 @@ 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.assertEqual(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)
+        self.assertEqual(results['1.3.6.1.4.1.43315.3.2.1.4.0'], 1)
         ## outstanding
-        self.assertEquals(results['1.3.6.1.4.1.43315.3.2.1.5.0'], 0)
+        self.assertEqual(results['1.3.6.1.4.1.43315.3.2.1.5.0'], 0)
         ## qpslimit
-        self.assertEquals(results['1.3.6.1.4.1.43315.3.2.1.6.0'], 0)
+        self.assertEqual(results['1.3.6.1.4.1.43315.3.2.1.6.0'], 0)
         ## reused
-        self.assertEquals(results['1.3.6.1.4.1.43315.3.2.1.7.0'], 0)
+        self.assertEqual(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.assertEqual(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.assertEqual(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.assertEqual(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)
+        self.assertEqual(results['1.3.6.1.4.1.43315.3.2.1.12.0'], queriesCountersValue)
         ## order
-        self.assertEquals(results['1.3.6.1.4.1.43315.3.2.1.13.0'], 1)
+        self.assertEqual(results['1.3.6.1.4.1.43315.3.2.1.13.0'], 1)
 
     def _getSNMPStats(self, auth):
         results = {}
@@ -98,8 +101,6 @@ class TestSNMP(DNSDistTest):
         return results
 
     def _checkStats(self, auth, name):
-        # wait 1s so that the uptime is > 0
-        time.sleep(1)
 
         results = self._getSNMPStats(auth)
         self._checkStatsValues(results, self.__class__._queriesSent)
@@ -118,8 +119,8 @@ class TestSNMP(DNSDistTest):
         self.assertTrue(receivedQuery)
         self.assertTrue(receivedResponse)
         receivedQuery.id = query.id
-        self.assertEquals(query, receivedQuery)
-        self.assertEquals(response, receivedResponse)
+        self.assertEqual(query, receivedQuery)
+        self.assertEqual(response, receivedResponse)
         self.__class__._queriesSent = self.__class__._queriesSent + 1
 
         results = self._getSNMPStats(auth)