rpcrt4: Reduce the timeout of waiting on the stop event in the server test to one second.

The stop event should already be signaled by the time we get to that point since we wait until the child processes terminate in the server process and the stop event is signaled in the context of one of the child processes. Don't call RpcMgmtWaitServerListening if the call to WaitForSingleObject failed since it is likely that s_stop() hasn't been called and therefore the call to RpcMgmtWaitServerListening won't ever return.

rpcrt4: Reduce the timeout of waiting on the stop event in the server test to one second.
fd8cb3f9 · Rob Shearman · Alexandre Julliard · 9ce356c9 · fd8cb3f9
Commit fd8cb3f9 authored Jun 14, 2008 by Rob Shearman Committed by Alexandre Julliard Jun 18, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

server.c dlls/rpcrt4/tests/server.c +11 -4

No files found.
--- a/dlls/rpcrt4/tests/server.c
+++ b/dlls/rpcrt4/tests/server.c
@@ -1242,6 +1242,7 @@ server(void)
  RPC_STATUS status, iptcp_status, np_status;
  RPC_STATUS (RPC_ENTRY *pRpcServerRegisterIfEx)(RPC_IF_HANDLE,UUID*,
    RPC_MGR_EPV*, unsigned int,unsigned int,RPC_IF_CALLBACK_FN*);
+  DWORD ret;
  iptcp_status = RpcServerUseProtseqEp(iptcp, 20, port, NULL);
  ok(iptcp_status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_ip_tcp) failed with status %ld\n", iptcp_status);
@@ -1278,10 +1279,16 @@ server(void)
    return;
  }
-  ok(WAIT_OBJECT_0 == WaitForSingleObject(stop_event, 60000), "WaitForSingleObject\n");
+  ret = WaitForSingleObject(stop_event, 1000);
-  status = RpcMgmtWaitServerListen();
+  ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n");
-  todo_wine {
+  /* if the stop event didn't fire then RpcMgmtWaitServerListen will wait
-    ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %ld\n", status);
+   * forever, so don't bother calling it in this case */
+  if (ret == WAIT_OBJECT_0)
+  {
+    status = RpcMgmtWaitServerListen();
+    todo_wine {
+      ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %ld\n", status);
+    }
  }
 }