So the race is between setting the new serial to return and the message coming in

Make sure we set the new serial asap

(cherry picked from commit 41c76595618291f9b69d7e03f3e7d1239cbfe1e9)

diff --git a/regression-tests.auth-py/test_XFRIncomplete.py b/regression-tests.auth-py/test_XFRIncomplete.py
index aef9016f0f9c04a2509164805825251d80c624b1..6061d3123f5162abe93286272e77d7487b96c037 100644 (file)
--- a/regression-tests.auth-py/test_XFRIncomplete.py
+++ b/regression-tests.auth-py/test_XFRIncomplete.py
@@ -24,8 +24,7 @@ class BadXFRServer(object):
         return self._currentSerial
 
     def moveToSerial(self, newSerial):
-        if newSerial == self._currentSerial:
-            print("newSerial == self._currentSerial", file=sys.stderr)
+        if newSerial == self._currentSerial or newSerial == self._targetSerial:
             return False
 
         #if newSerial != self._currentSerial + 1:
@@ -172,6 +171,7 @@ slave-cycle-interval=1
             if currentSerial > serial:
                 raise AssertionError("Expected serial %d, got %d" % (serial, currentSerial))
             if currentSerial == serial:
+                badxfrServer.moveToSerial(serial+1)
                 return
 
             attempts = attempts + 1