diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-10-19 06:30:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:44:55 -0500 |
| commit | 4c242c96e0dbd45f740c1efb36d9565767a38285 (patch) | |
| tree | ce0087a70ac42a2d1f7f47c501e0017ed8ac3488 | |
| parent | 8c8c40ecaa161c3dcba237f0c008cb793c604460 (diff) | |
| download | samba-4c242c96e0dbd45f740c1efb36d9565767a38285.tar.gz samba-4c242c96e0dbd45f740c1efb36d9565767a38285.tar.bz2 samba-4c242c96e0dbd45f740c1efb36d9565767a38285.zip | |
r11173: print out the correct messages
metze
(This used to be commit d8e7e914bf29f7ae0b7cc1f47ea9f8cca210d8df)
| -rw-r--r-- | source4/torture/nbt/winsreplication.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c index 012c07c748..a99099c780 100644 --- a/source4/torture/nbt/winsreplication.c +++ b/source4/torture/nbt/winsreplication.c @@ -2944,6 +2944,25 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx) } if (!records[i].cleanup) { + const char *expected; + const char *ips; + + if (records[i].r2.merge_expected) { + expected = "MERGE"; + } else if (records[i].r2.apply_expected) { + expected = "REPLACE"; + } else { + expected = "NOT REPLACE"; + } + + if (!records[i].r1.ips && !records[i].r2.ips) { + ips = "no"; + } else if (records[i].r1.ips==records[i].r2.ips) { + ips = "same"; + } else { + ips = "different"; + } + printf("%s,%s%s vs. %s,%s%s with %s ip(s) => %s\n", wrepl_name_type_string(records[i].r1.type), wrepl_name_state_string(records[i].r1.state), @@ -2951,8 +2970,7 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx) wrepl_name_type_string(records[i].r2.type), wrepl_name_state_string(records[i].r2.state), (records[i].r2.is_static?",static":""), - (records[i].r1.ips==records[i].r2.ips?"same":"different"), - (records[i].r2.apply_expected?"REPLACE":"NOT REPLACE")); + ips, expected); } /* |