sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

NBT-WINSREPLICATION: be more robust to timing errors

Browse Source 
Also reenable disabled tests.

metze
(This used to be commit 76878a9c798e0acb0387b8352972d66db989c09a)
This commit is contained in:
Stefan Metzmacher 2008-08-13 16:53:13 +02:00
parent 336f6810ce
commit 8b585deae4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/torture/nbt/winsreplication.c
View File

@ -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;