4.6.x has no waitForTCPSocket plus counts are different due to rpz loading changes...

diff --git a/regression-tests.recursor-dnssec/test_RPZIncomplete.py b/regression-tests.recursor-dnssec/test_RPZIncomplete.py
index b5a0e8a9852068f9eb3a915b87381362128c3e33..906d0f28dadfdfd9cb435f1af4bfe27931d232c5 100644 (file)
--- a/regression-tests.recursor-dnssec/test_RPZIncomplete.py
+++ b/regression-tests.recursor-dnssec/test_RPZIncomplete.py
@@ -226,16 +226,15 @@ e 3600 IN A 192.0.2.42
         raise AssertionError("Waited %d seconds for the serial to be updated to %d but the serial is still %d" % (timeout, serial, currentSerial))
 
     def testRPZ(self):
-        self.waitForTCPSocket("127.0.0.1", self._wsPort)
         # First zone
         self.waitUntilCorrectSerialIsLoaded(1)
-        self.checkRPZStats(1, 1, 1, 1, 1) # failure count includes a port 9999 attempt
+        self.checkRPZStats(1, 1, 1, 1, 3) # failure count includes a port 9999 attempt
 
         # second zone, should fail, incomplete IXFR
         self.waitUntilCorrectSerialIsLoaded(2)
-        self.checkRPZStats(1, 1, 1, 1, 3)
+        self.checkRPZStats(1, 1, 1, 1, 5)
 
         # third zone, should fail, incomplete AXFR
         self.waitUntilCorrectSerialIsLoaded(3)
-        self.checkRPZStats(1, 1, 1, 1, 5)
+        self.checkRPZStats(1, 1, 1, 1, 7)