summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-02-14 09:44:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:51 -0500
commit4e43af6c69645c2c48586a1c5ebb92869d69e910 (patch)
treecc148cf4dcf571c32c239e3987d63fb3b28e7257
parentc29141f10bba7024fb2630b3e4c7f658bbf472be (diff)
downloadsamba-4e43af6c69645c2c48586a1c5ebb92869d69e910.tar.gz
samba-4e43af6c69645c2c48586a1c5ebb92869d69e910.tar.bz2
samba-4e43af6c69645c2c48586a1c5ebb92869d69e910.zip
r5394: 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 (This used to be commit 9a657f358e7aa3f96c414de033808de82fdb831a)
-rw-r--r--source4/torture/rpc/echo.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index 9a2e656bfe..d01bda1f68 100644
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -263,19 +263,18 @@ static BOOL test_sleep(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
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;*/
}