summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-11-23 12:30:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:46:40 -0500
commit31d070637b646c4eb65341891cbdf3e0f0142538 (patch)
treebc57ce669ab9c0ce89d469fc8a64745bc032bc99
parent4e84ae3d3fc4cb14869eb46651c95b2d36fa9ce5 (diff)
downloadsamba-31d070637b646c4eb65341891cbdf3e0f0142538.tar.gz
samba-31d070637b646c4eb65341891cbdf3e0f0142538.tar.bz2
samba-31d070637b646c4eb65341891cbdf3e0f0142538.zip
r11882: - use some better names
- we now pass the same_owner tests so test them with make test metze (This used to be commit 579ebb874e40c66dc45c5468bfa0658c7fabcc61)
-rw-r--r--source4/torture/nbt/winsreplication.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 8ba9c74394..2aace9fd97 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -8382,7 +8382,7 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
*/
{
.line = __location__,
- .name = _NBT_NAME("_MA_MA_SB_C", 0x00, NULL),
+ .name = _NBT_NAME("_MA_MA_SB_PRA", 0x00, NULL),
.skip = (ctx->addresses_all_num < 3),
.wins = {
.nb_flags = 0,
@@ -8476,7 +8476,7 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
{
.line = __location__,
.section= "Test Replica vs. owned active: some more UNIQUE,MHOMED combinations",
- .name = _NBT_NAME("_MA_UA_SB_A", 0x00, NULL),
+ .name = _NBT_NAME("_MA_UA_SB_P", 0x00, NULL),
.skip = (ctx->addresses_all_num < 3),
.wins = {
.nb_flags = 0,
@@ -9249,6 +9249,7 @@ BOOL torture_nbt_winsreplication_quick(void)
TALLOC_CTX *mem_ctx = talloc_new(NULL);
NTSTATUS status;
BOOL ret = True;
+ struct test_wrepl_conflict_conn *ctx;
make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
@@ -9266,6 +9267,10 @@ BOOL torture_nbt_winsreplication_quick(void)
ret &= test_wins_replication(mem_ctx, address);
+ ctx = test_create_conflict_ctx(mem_ctx, address);
+
+ ret &= test_conflict_same_owner(ctx);
+
talloc_free(mem_ctx);
return ret;