Fix a flake by extending the time out, so we don't race a go routine.
Empirically this eliminates a flake.
Merge pull request #1049 from brendandburns/flake

Fix a flake by extending the time out, so we don't race a go routine.