diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/nbt/winsreplication.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c index 0639155f00..1df8a3e6b6 100644 --- a/source4/torture/nbt/winsreplication.c +++ b/source4/torture/nbt/winsreplication.c @@ -38,12 +38,12 @@ #define CHECK_VALUE(tctx, v, correct) \ torture_assert(tctx, (v) == (correct), \ - talloc_asprintf(tctx, "Incorrect value %s=%d - should be %d", \ + talloc_asprintf(tctx, "Incorrect value %s=%d - should be %d\n", \ #v, v, correct)) #define CHECK_VALUE_UINT64(tctx, v, correct) \ torture_assert(tctx, (v) == (correct), \ - talloc_asprintf(tctx, "Incorrect value %s=%llu - should be %llu", \ + talloc_asprintf(tctx, "Incorrect value %s=%llu - should be %llu\n", \ #v, (long long)v, (long long)correct)) #define CHECK_VALUE_STRING(tctx, v, correct) \ @@ -790,8 +790,8 @@ static bool test_wrepl_is_applied(struct torture_context *tctx, status = wrepl_pull_names(ctx->pull, ctx->pull, &pull_names); CHECK_STATUS(tctx, status, NT_STATUS_OK); - torture_assert(tctx, pull_names.out.num_names == (expected?1:0), - "Invalid number of records returned"); + torture_assert(tctx, pull_names.out.num_names == expected, + talloc_asprintf(tctx, "Invalid number of records returned - expected %d got %d", expected, pull_names.out.num_names)); names = pull_names.out.names; @@ -6698,6 +6698,7 @@ 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 */ @@ -6724,6 +6725,7 @@ 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 */ @@ -8962,6 +8964,7 @@ 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) */ @@ -9151,6 +9154,7 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx, .apply_expected = false }, }, +#endif }; if (!ctx->nbtsock_srv) { @@ -9666,22 +9670,22 @@ static bool torture_nbt_winsreplication_owned(struct torture_context *tctx) struct torture_suite *torture_nbt_winsreplication(void) { struct torture_suite *suite = torture_suite_create( - talloc_autofree_context(), - "WINSREPLICATION"); + talloc_autofree_context(), + "WINSREPLICATION"); torture_suite_add_simple_test(suite, "assoc_ctx1", - test_assoc_ctx1); + test_assoc_ctx1); torture_suite_add_simple_test(suite, "assoc_ctx2", - test_assoc_ctx2); + test_assoc_ctx2); torture_suite_add_simple_test(suite, "wins_replication", - test_wins_replication); + test_wins_replication); torture_suite_add_simple_test(suite, "replica", - torture_nbt_winsreplication_replica); + torture_nbt_winsreplication_replica); torture_suite_add_simple_test(suite, "owned", - torture_nbt_winsreplication_owned); + torture_nbt_winsreplication_owned); return suite; } |