Attachment 8767 Details for Bug 9485 – Fix for dns tests

[patch] Fix for dns tests

0001-tests-dns-Do-not-return-in-try.finally-block.patch (text/plain), 1.28 KB, created by Amitay Isaacs on 2013-04-12 08:32:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2013-04-12 08:32:09 UTC

Size: 1.28 KB

patch

obsolete

>From af9e05acce8e7b1ee036fdd053bac47282fff8c9 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Fri, 12 Apr 2013 18:30:42 +1000
>Subject: [PATCH] tests/dns: Do not return in try..finally block
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>---
> python/samba/tests/dns.py | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/python/samba/tests/dns.py b/python/samba/tests/dns.py
>index 49d699e..cb52bfd 100644
>--- a/python/samba/tests/dns.py
>+++ b/python/samba/tests/dns.py
>@@ -85,16 +85,18 @@ class DNSTest(TestCase):
>     def dns_transaction_udp(self, packet, host=os.getenv('SERVER_IP')):
>         "send a DNS query and read the reply"
>         s = None
>+        p = None
>         try:
>             send_packet = ndr.ndr_pack(packet)
>             s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0)
>             s.connect((host, 53))
>             s.send(send_packet, 0)
>             recv_packet = s.recv(2048, 0)
>-            return ndr.ndr_unpack(dns.name_packet, recv_packet)
>+            p = ndr.ndr_unpack(dns.name_packet, recv_packet)
>         finally:
>             if s is not None:
>                 s.close()
>+        return p
> 
>     def dns_transaction_tcp(self, packet, host=os.getenv('SERVER_IP')):
>         "send a DNS query and read the reply"
>-- 
>1.8.1.4
>

Actions: View

Attachments on bug 9485: 8314 | 8767 | 8903