Make smtp test more robust

It may have ended up with changes still in the pipeline because
it uses the timer trigger.

Change-Id: Ieb46d7b5b7020e62e7d3baa704e3f75f9f87dca1
Merge "Make smtp test more robust"