1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00

s4:drs:test:getncchanges: remove timeout failure

We don't need a timeout failure any more, since replication should
always work. Leaving the timeout in might sometimes cause a flapping
test if replication is being slow for some reason.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15701

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <josutton@catalyst.net.nz>
(cherry picked from commit 44a478038b)
This commit is contained in:
Douglas Bagnall 2024-08-09 11:29:11 +12:00 committed by Jule Anger
parent 28626e763e
commit 5842ec1d05

View File

@ -33,7 +33,6 @@ import samba.tests
import ldb import ldb
from ldb import SCOPE_BASE from ldb import SCOPE_BASE
import random import random
import time
from samba.dcerpc import drsuapi, misc from samba.dcerpc import drsuapi, misc
from samba import WERRORError from samba import WERRORError
@ -58,7 +57,6 @@ class DrsReplicaSyncIntegrityTestCase(drs_base.DrsBaseTestCase):
self.default_conn = DcConnection(self, self.ldb_dc2, self.dnsname_dc2) self.default_conn = DcConnection(self, self.ldb_dc2, self.dnsname_dc2)
self.set_dc_connection(self.default_conn) self.set_dc_connection(self.default_conn)
self.start_time = time.time()
def init_test_state(self): def init_test_state(self):
self.rxd_dn_list = [] self.rxd_dn_list = []
@ -360,9 +358,6 @@ class DrsReplicaSyncIntegrityTestCase(drs_base.DrsBaseTestCase):
def replication_complete(self): def replication_complete(self):
"""Returns True if the current/last replication cycle is complete""" """Returns True if the current/last replication cycle is complete"""
now = time.time()
if now - self.start_time > 30:
self.fail("we seem to be in an eternal loop")
if self.last_ctr is None or self.last_ctr.more_data: if self.last_ctr is None or self.last_ctr.more_data:
return False return False