]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
python/tests: catch NT_STATUS_IO_TIMEOUT from witness.witness() as AssertionError()
authorStefan Metzmacher <metze@samba.org>
Mon, 10 Aug 2026 10:39:56 +0000 (12:39 +0200)
committerStefan Metzmacher <metze@samba.org>
Mon, 10 Aug 2026 16:42:23 +0000 (16:42 +0000)
This way it's actually possible to mark it as flapping

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Björn Jacke <bjacke@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Mon Aug 10 16:42:23 UTC 2026 on atb-devel-224

python/samba/tests/blackbox/rpcd_witness_samba_only.py

index 38bc7e078c3deb6d05f6e09fd4299510c04905a0..5d29222398450319838af18e654def98c29e42c3 100755 (executable)
@@ -31,7 +31,7 @@ from samba.ndr import ndr_print
 from samba.dcerpc import witness
 from samba.tests import DynamicTestCase, BlackboxTestCase
 from samba.common import get_string
-from samba import werror, WERRORError
+from samba import werror, WERRORError, ntstatus, NTSTATUSError
 
 @DynamicTestCase
 class RpcdWitnessSambaTests(BlackboxTestCase):
@@ -263,7 +263,14 @@ class RpcdWitnessSambaTests(BlackboxTestCase):
         if disable_idx != -1:
             self.disable_node(disable_idx)
 
-        conn = witness.witness(binding_string, self.lp, self.remote_creds)
+        try:
+            conn = witness.witness(binding_string, self.lp, self.remote_creds)
+        except NTSTATUSError as e:
+            (num, string) = e.args
+            if num == ntstatus.NT_STATUS_IO_TIMEOUT:
+                raise AssertionError(e)
+            raise
+
         interface_list = conn.GetInterfaceList()
 
         if disable_idx != -1:
@@ -461,7 +468,13 @@ class RpcdWitnessSambaTests(BlackboxTestCase):
 
         computer_name = "test-rpcd-witness-samba-only-client-computer"
 
-        conn = witness.witness(binding_string, self.lp, self.remote_creds)
+        try:
+            conn = witness.witness(binding_string, self.lp, self.remote_creds)
+        except NTSTATUSError as e:
+            (num, string) = e.args
+            if num == ntstatus.NT_STATUS_IO_TIMEOUT:
+                raise AssertionError(e)
+            raise
 
         if disable_before_reg:
             self.assertFalse(disable_after_reg)
@@ -566,7 +579,14 @@ class RpcdWitnessSambaTests(BlackboxTestCase):
                     binding_string = node["binding_string32"]
                     ndr_name = "NDR32"
 
-                conn = witness.witness(binding_string, self.lp, self.remote_creds)
+                try:
+                    conn = witness.witness(binding_string, self.lp, self.remote_creds)
+                except NTSTATUSError as e:
+                    (num, string) = e.args
+                    if num == ntstatus.NT_STATUS_IO_TIMEOUT:
+                        raise AssertionError(e)
+                    raise
+
                 conn_ip = node["ip"]
 
                 net_name = self.server_hostname