summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-10-17 10:55:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:44:51 -0500
commit91366a1c96f18f6911e0b143de6df6a9490470d4 (patch)
tree91e5fb52b52c24e97af47b28156eab3659b31b48 /source4/torture
parent31ffec1d4194f947eb27c11b488bbe105ea8b8c5 (diff)
downloadsamba-91366a1c96f18f6911e0b143de6df6a9490470d4.tar.gz
samba-91366a1c96f18f6911e0b143de6df6a9490470d4.tar.bz2
samba-91366a1c96f18f6911e0b143de6df6a9490470d4.zip
r11108: - always test the old and new record
- check that the record is the same as what we pushed to the server (we need to verify the ip-addresses later too...) metze (This used to be commit f59e90299d1060a3c61ee24bdf4a2a13aac1bccf)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/nbt/winsreplication.c39
1 files changed, 36 insertions, 3 deletions
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 62a4b9f9ba..befec50c96 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -40,6 +40,24 @@
goto done; \
}} while (0)
+#define CHECK_VALUE_UINT64(v, correct) do { \
+ if ((v) != (correct)) { \
+ printf("(%s) Incorrect value %s=%llu - should be %llu\n", \
+ __location__, #v, v, correct); \
+ ret = False; \
+ goto done; \
+ }} while (0)
+
+#define CHECK_VALUE_STRING(v, correct) do { \
+ if ( ((!v) && (correct)) || \
+ ((v) && (!correct)) || \
+ ((v) && (correct) && strcmp(v,correct) != 0)) { \
+ printf("(%s) Incorrect value %s='%s' - should be '%s'\n", \
+ __location__, #v, v, correct); \
+ ret = False; \
+ goto done; \
+ }} while (0)
+
#define _NBT_NAME(n,t,s) {\
.name = n,\
.type = t,\
@@ -469,6 +487,7 @@ static BOOL test_wrepl_is_applied(struct test_wrepl_conflict_conn *ctx,
BOOL ret = True;
NTSTATUS status;
struct wrepl_pull_names pull_names;
+ struct wrepl_name *names;
pull_names.in.assoc_ctx = ctx->pull_assoc;
pull_names.in.partner = *owner;
@@ -478,6 +497,19 @@ static BOOL test_wrepl_is_applied(struct test_wrepl_conflict_conn *ctx,
CHECK_STATUS(status, NT_STATUS_OK);
CHECK_VALUE(pull_names.out.num_names, (expected?1:0));
+ names = pull_names.out.names;
+
+ if (expected) {
+ uint32_t flags = WREPL_NAME_FLAGS(names[0].type,
+ names[0].state,
+ names[0].node,
+ names[0].is_static);
+ CHECK_VALUE(names[0].name.type, name->name->type);
+ CHECK_VALUE_STRING(names[0].name.name, name->name->name);
+ CHECK_VALUE_STRING(names[0].name.scope, name->name->scope);
+ CHECK_VALUE(flags, name->flags);
+ CHECK_VALUE_UINT64(names[0].version_id, name->id);
+ }
done:
talloc_free(pull_names.out.names);
return ret;
@@ -1458,11 +1490,12 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
/* now apply R2 */
ret &= test_wrepl_update_one(ctx, records[i].r2.owner, wins_name_r2);
- if (records[i].r2.apply_expected &&
- (records[i].r1.state == WREPL_STATE_RELEASED ||
- records[i].r2.state == WREPL_STATE_RELEASED)) {
+ if (records[i].r1.state == WREPL_STATE_RELEASED) {
ret &= test_wrepl_is_applied(ctx, records[i].r1.owner,
wins_name_r1, False);
+ } else if (records[i].r1.owner != records[i].r2.owner) {
+ ret &= test_wrepl_is_applied(ctx, records[i].r1.owner,
+ wins_name_r1, !records[i].r2.apply_expected);
}
if (records[i].r2.state == WREPL_STATE_RELEASED) {
ret &= test_wrepl_is_applied(ctx, records[i].r2.owner,