diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-05-12 07:44:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:20 -0500 |
| commit | 5c0963acc38e5883674c1e08ae04dd116815ab08 (patch) | |
| tree | 519dec5266b4ebb988e2b79f0347b5b8028487bb | |
| parent | 7e14a25dc66082f48143368fef305067d4c0dfab (diff) | |
| download | samba-5c0963acc38e5883674c1e08ae04dd116815ab08.tar.gz samba-5c0963acc38e5883674c1e08ae04dd116815ab08.tar.bz2 samba-5c0963acc38e5883674c1e08ae04dd116815ab08.zip | |
r22813: improve error messages in RAW-NOTIFY test
(This used to be commit f5b2011db9b05fcca82f6a6b3976aa1b4924b0a8)
| -rw-r--r-- | source4/torture/raw/notify.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c index c75dbf0931..51e73f1115 100644 --- a/source4/torture/raw/notify.c +++ b/source4/torture/raw/notify.c @@ -489,14 +489,27 @@ static BOOL test_notify_mask(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) ((expected) & FILE_NOTIFY_CHANGE_ATTRIBUTES) && \ Action == NOTIFY_ACTION_OLD_NAME) { \ printf("(rename file special handling OK)\n"); \ - } else if (nchanges != notify.nttrans.out.num_changes || \ - notify.nttrans.out.changes[0].action != Action || \ - strcmp(notify.nttrans.out.changes[0].name.s, "tname1") != 0) { \ - printf("ERROR: nchanges=%d action=%d filter=0x%08x\n", \ + } else if (nchanges != notify.nttrans.out.num_changes) { \ + printf("ERROR: nchanges=%d expected=%d action=%d filter=0x%08x\n", \ notify.nttrans.out.num_changes, \ + nchanges, \ notify.nttrans.out.changes[0].action, \ notify.nttrans.in.completion_filter); \ ret = False; \ + } else if (notify.nttrans.out.changes[0].action != Action) { \ + printf("ERROR: nchanges=%d action=%d expectedAction=%d filter=0x%08x\n", \ + notify.nttrans.out.num_changes, \ + notify.nttrans.out.changes[0].action, \ + Action, \ + notify.nttrans.in.completion_filter); \ + ret = False; \ + } else if (strcmp(notify.nttrans.out.changes[0].name.s, "tname1") != 0) { \ + printf("ERROR: nchanges=%d action=%d filter=0x%08x name=%s\n", \ + notify.nttrans.out.num_changes, \ + notify.nttrans.out.changes[0].action, \ + notify.nttrans.in.completion_filter, \ + notify.nttrans.out.changes[0].name.s); \ + ret = False; \ } \ mask |= (1<<i); \ } \ |