svn commit: samba r5394 - in branches/SAMBA_4_0/source/torture/rpc: .

[metze at samba.org]

Author: metze
Date: 2005-02-14 09:44:58 +0000 (Mon, 14 Feb 2005)
New Revision: 5394

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

Log:
as the timing should be fixed in the server now, don't accept to early replies
anymore, also print out usecs in the debug messages

metze

Modified:
   branches/SAMBA_4_0/source/torture/rpc/echo.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/echo.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/echo.c	2005-02-14 09:43:36 UTC (rev 5393)
+++ branches/SAMBA_4_0/source/torture/rpc/echo.c	2005-02-14 09:44:58 UTC (rev 5394)
@@ -263,19 +263,18 @@
 					       	r[i].out.result, r[i].in.seconds, (uint_t)diff[i].tv_sec);
 					ret = False;
 				} else {
-					if (r[i].out.result > diff[i].tv_sec+1) {
-						printf("Failed - Sleeped for %u seconds (but reply takes only %u seconds)\n", 
-					       		r[i].out.result, (uint_t)diff[i].tv_sec);
-						ret = False;
+					if (r[i].out.result > diff[i].tv_sec) {
+						printf("Failed - Sleeped for %u seconds (but reply takes only %u.%06u seconds)\n", 
+					       		r[i].out.result, (uint_t)diff[i].tv_sec, (uint_t)diff[i].tv_usec);
 					} else if (r[i].out.result+1 == diff[i].tv_sec) {
-						printf("Sleeped for %u seconds (but reply takes %u seconds - busy server?)\n", 
-					       		r[i].out.result, (uint_t)diff[i].tv_sec);
+						printf("Sleeped for %u seconds (but reply takes %u.%06u seconds - busy server?)\n", 
+					       		r[i].out.result, (uint_t)diff[i].tv_sec, (uint_t)diff[i].tv_usec);
 					} else if (r[i].out.result == diff[i].tv_sec) {
-						printf("Sleeped for %u seconds (reply takes %u seconds - ok)\n", 
-					       		r[i].out.result, (uint_t)diff[i].tv_sec);
+						printf("Sleeped for %u seconds (reply takes %u.%06u seconds - ok)\n", 
+					       		r[i].out.result, (uint_t)diff[i].tv_sec, (uint_t)diff[i].tv_usec);
 					} else {
-					       	printf("(Failed) - Not async - Sleeped for %u seconds (but reply takes %u seconds)\n", 
-					       		r[i].out.result, (uint_t)diff[i].tv_sec);
+					       	printf("(Failed) - Not async - Sleeped for %u seconds (but reply takes %u.%06u seconds)\n", 
+					       		r[i].out.result, (uint_t)diff[i].tv_sec, (uint_t)diff[i].tv_usec);
 						/* TODO: let the test fail here, when we support async rpc on ncacn_np
 						ret = False;*/
 					}