[SCM] Samba Shared Repository - branch master updated

Michael Adam obnox at samba.org
Mon Nov 26 05:54:02 MST 2012

The branch, master has been updated
       via  8336061 s4:torture/rpc/handles: try to make all assoc_group tests less flakey
      from  e4218e4 configure(waf):  Fail "configure --with-ads" if ads support is not available


- Log -----------------------------------------------------------------
commit 8336061096c259f5c3c93f869ff51bf4daab3fdc
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Nov 24 11:28:57 2012 +0100

    s4:torture/rpc/handles: try to make all assoc_group tests less flakey
    Just incrementing the assoc_group_id makes it too likely to hit
    a number that is already in use.
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Mon Nov 26 13:53:22 CET 2012 on sn-devel-104


Summary of changes:
 source4/torture/rpc/handles.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/handles.c b/source4/torture/rpc/handles.c
index 3fdce56..5c08a5f 100644
--- a/source4/torture/rpc/handles.c
+++ b/source4/torture/rpc/handles.c
@@ -471,6 +471,11 @@ static bool test_handles_mixed_shared(struct torture_context *torture)
 	torture_assert_ntstatus_equal(torture, status, NT_STATUS_UNSUCCESSFUL,
 				      "opening lsa pipe4");
+	/*
+	 * We use ~assoc_group_id instead of p1->assoc_group_id, because
+	 * this way we are less likely to use an id which is already in use.
+	 */
+	assoc_group_id = ~assoc_group_id;
 	torture_comment(torture, "connect samr pipe5 with assoc_group_id[0x%08X]- should fail\n", ++assoc_group_id);
 	status = torture_rpc_connection_transport(torture, &p5, &ndr_table_samr,

Samba Shared Repository

More information about the samba-cvs mailing list