The branch, master has been updated via 4519077 tests/dns_forwarder: Fail out with an assertion instead OOB error via ad3b3e9 tests/dns_forwarder: Check that the subprocess is still living via 668e4e4 tests/dns_forwarder: Wait for port for 15 seconds from aef1d45 samba-tool: Remove --use-xattrs support without --use-ntvfs
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 451907739cc14717c12875b88fbbe63a53e9cbec Author: Garming Sam <garm...@samba.org> Date: Thu Jun 9 03:52:38 2016 +0200 tests/dns_forwarder: Fail out with an assertion instead OOB error Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> Autobuild-User(master): Garming Sam <garm...@samba.org> Autobuild-Date(master): Tue Sep 6 15:41:54 CEST 2016 on sn-devel-144 commit ad3b3e978ebf0692580166f9deba0368a922362d Author: Garming Sam <garm...@catalyst.net.nz> Date: Thu Jul 7 16:58:27 2016 +1200 tests/dns_forwarder: Check that the subprocess is still living Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 668e4e4a436756d73d64790fd0a7e79fa4769ffe Author: Garming Sam <garm...@catalyst.net.nz> Date: Tue Sep 6 10:48:57 2016 +1200 tests/dns_forwarder: Wait for port for 15 seconds Signed-off-by: Garming Sam <garm...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> ----------------------------------------------------------------------- Summary of changes: python/samba/tests/dns_forwarder.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/python/samba/tests/dns_forwarder.py b/python/samba/tests/dns_forwarder.py index de36de9..51a8619 100644 --- a/python/samba/tests/dns_forwarder.py +++ b/python/samba/tests/dns_forwarder.py @@ -185,14 +185,18 @@ class TestDnsForwarding(DNSTest): host, str(port), id]) self.subprocesses.append(p) s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0) - for i in xrange(30): - time.sleep(0.01) + for i in xrange(300): + time.sleep(0.05) s.connect((host, port)) try: s.send('timeout 0', 0) except socket.error, e: if e.errno in (errno.ECONNREFUSED, errno.EHOSTUNREACH): continue + + if p.returncode is not None: + self.fail("Toy server has managed to die already!") + return s def tearDown(self): @@ -462,8 +466,9 @@ class TestDnsForwarding(DNSTest): try: data = ad.recv(0xffff + 2, 0) data = ndr.ndr_unpack(dns.name_packet, data) - self.assertEqual('forwarder1', data.answers[0].rdata) self.assert_dns_rcode_equals(data, dns.DNS_RCODE_OK) + self.assertEqual(len(data.answers), 1) + self.assertEqual('forwarder1', data.answers[0].rdata) except socket.timeout: self.fail("DNS server is too slow (timeout %s)" % timeout) -- Samba Shared Repository