svn commit: samba r22813 - in branches/SAMBA_4_0/source/torture/raw: .

[tridge at samba.org]

Author: tridge
Date: 2007-05-12 07:44:09 +0000 (Sat, 12 May 2007)
New Revision: 22813

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22813

Log:

improve error messages in RAW-NOTIFY test

Modified:
   branches/SAMBA_4_0/source/torture/raw/notify.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/notify.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/notify.c	2007-05-12 01:08:09 UTC (rev 22812)
+++ branches/SAMBA_4_0/source/torture/raw/notify.c	2007-05-12 07:44:09 UTC (rev 22813)
@@ -489,14 +489,27 @@
 		    ((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); \
 	} \