Fix test failures if content promotion/demotion is slow.

Happening on jenkins.