[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-256-g0449a5c

Stefan Metzmacher metze at samba.org
Thu Aug 14 11:14:43 GMT 2008


The branch, v4-0-test has been updated
       via  0449a5c8267873d7986c7c50adce57029192c456 (commit)
       via  76878a9c798e0acb0387b8352972d66db989c09a (commit)
      from  0576875eccaa21ad529c9db41db91781ad400d0f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 0449a5c8267873d7986c7c50adce57029192c456
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Aug 13 16:58:12 2008 +0200

    pidl: fix samba4.pidl.samba3-cli test
    
    metze

commit 76878a9c798e0acb0387b8352972d66db989c09a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Aug 13 16:53:13 2008 +0200

    NBT-WINSREPLICATION: be more robust to timing errors
    
    Also reenable disabled tests.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source/pidl/tests/samba3-cli.pl      |    2 --
 source/torture/nbt/winsreplication.c |   12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/pidl/tests/samba3-cli.pl b/source/pidl/tests/samba3-cli.pl
index 80725d2..d762954 100755
--- a/source/pidl/tests/samba3-cli.pl
+++ b/source/pidl/tests/samba3-cli.pl
@@ -44,7 +44,6 @@ is($x->{res},
 
 	status = cli_do_rpc_ndr(cli,
 				mem_ctx,
-				PI_FOO,
 				&ndr_table_foo,
 				NDR_BAR,
 				&r);
@@ -89,7 +88,6 @@ is($x->{res},
 
 	status = cli_do_rpc_ndr(cli,
 				mem_ctx,
-				PI_FOO,
 				&ndr_table_foo,
 				NDR_BAR,
 				&r);
diff --git a/source/torture/nbt/winsreplication.c b/source/torture/nbt/winsreplication.c
index ee7a151..6b600bd 100644
--- a/source/torture/nbt/winsreplication.c
+++ b/source/torture/nbt/winsreplication.c
@@ -6701,7 +6701,6 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
 /* 
  * unique vs. unique section
  */
-#if METZE_NEEDS_TO_LOOK_AT_THIS_ONE
 	/*
 	 * unique,active vs. unique,active with same ip(s), unchecked
 	 */
@@ -6728,7 +6727,6 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
 			.apply_expected	= true
 		},
 	},
-#endif
 	/*
 	 * unique,active vs. unique,active with different ip(s), positive response
 	 */
@@ -8967,7 +8965,6 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
 			.sgroup_merge	= true
 		},
 	},
-#if 0
 	/*
 	 * sgroup,active vs. sgroup,active with same ip(s)
 	 */
@@ -9157,7 +9154,6 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
 			.apply_expected	= false
 		},
 	},
-#endif
 	};
 
 	if (!ctx->nbtsock_srv) {
@@ -9543,7 +9539,9 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
 	talloc_free(rep_packet);
 
 	/* make sure we push the reply to the wire */
-	event_loop_once(nbtsock->event_ctx);
+	while (nbtsock->send_queue) {
+		event_loop_once(nbtsock->event_ctx);
+	}
 	msleep(1000);
 
 	rec->defend.timeout	= 0;
@@ -9598,7 +9596,9 @@ static void test_conflict_owned_active_vs_replica_handler_release(
 	talloc_free(rep_packet);
 
 	/* make sure we push the reply to the wire */
-	event_loop_once(nbtsock->event_ctx);
+	while (nbtsock->send_queue) {
+		event_loop_once(nbtsock->event_ctx);
+	}
 	msleep(1000);
 
 	rec->defend.timeout	= 0;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list