s4-dnsserver: Check the raised exception with assertRaises
authorAmitay Isaacs <amitay@gmail.com>
Mon, 24 Oct 2011 06:37:24 +0000 (17:37 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 2 Nov 2011 04:26:54 +0000 (15:26 +1100)
Signed-off-by: Andrew Tridgell <tridge@samba.org>
source4/scripting/python/samba/tests/dcerpc/dnsserver.py

index d185efb5b0686ff2200431e912f1b3eb183a4179..33c5cf7d5e45ec7c6394b608020ee5b3a736078c 100644 (file)
@@ -166,16 +166,14 @@ class DnsserverTests(RpcInterfaceTestCase):
                                         None,
                                         del_rec_buf)
 
-        try:
-            buflen, result = self.conn.DnssrvEnumRecords2(client_version,
-                                                            0,
-                                                            self.server,
-                                                            self.zone,
-                                                            name,
-                                                            None,
-                                                            record_type,
-                                                            select_flags,
-                                                            None,
-                                                            None)
-        except RuntimeError, e:
-            self.assertEquals("(9714, 'WERR_DNS_ERROR_NAME_DOES_NOT_EXIST')", str(e))
+        self.assertRaises(RuntimeError, self.conn.DnssrvEnumRecords2,
+                                        client_version,
+                                        0,
+                                        self.server,
+                                        self.zone,
+                                        name,
+                                        None,
+                                        record_type,
+                                        select_flags,
+                                        None,
+                                        None)