fix race in test_wait on busy server

fix bug 1224208

Change-Id: I83c673a87c31214a7c54b6399ca53512885e6bc3
Merge "fix race in test_wait on busy server"