diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-08-13 16:53:13 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-08-14 13:13:48 +0200 |
| commit | 8b585deae44f42b24182ec5d243f7d1e23012478 (patch) | |
| tree | 2fae657ee358fd4eeef68e43273bd9bb39cd1450 /source4/torture/nbt | |
| parent | 336f6810cec9b30ad497da26ee463ed5736db2bd (diff) | |
| download | samba-8b585deae44f42b24182ec5d243f7d1e23012478.tar.gz samba-8b585deae44f42b24182ec5d243f7d1e23012478.tar.bz2 samba-8b585deae44f42b24182ec5d243f7d1e23012478.zip | |
NBT-WINSREPLICATION: be more robust to timing errors
Also reenable disabled tests.
metze
(This used to be commit 76878a9c798e0acb0387b8352972d66db989c09a)
Diffstat (limited to 'source4/torture/nbt')
| -rw-r--r-- | source4/torture/nbt/winsreplication.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c index ee7a1510d5..6b600bd7cd 100644 --- a/source4/torture/nbt/winsreplication.c +++ b/source4/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; |