Longer timeout and better assertion messages.

This test fails regularly under load. 10s may not be enough on a busy
machine.
(cherry picked from commit 077917d1871fa0386b2d8cd11e3e28088f654a7c)