From: Otto Moerbeek Date: Tue, 29 Mar 2022 13:48:10 +0000 (+0200) Subject: rec: rec-4.4.x has no waitForTCPSocket in test code X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11481%2Fhead;p=thirdparty%2Fpdns.git rec: rec-4.4.x has no waitForTCPSocket in test code Plus counts are different due to rpz loading changes in master. --- diff --git a/regression-tests.recursor-dnssec/test_RPZIncomplete.py b/regression-tests.recursor-dnssec/test_RPZIncomplete.py index b5a0e8a985..906d0f28da 100644 --- 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)