Fix -retry: test

Clarify retry count vs total try count. Also, wait for the error before asserting the total try count.

Fixes #1033