Don't assume log output is available immediately.
Lint fixes.
Merge pull request #852 from ClusterHQ/intermittent-test-failure-851

Only perform the assertion when we see a marker string in the test container output

Author: @itamarst 
Reviewer: @wallrj

Fixes #851