bug 1003253 - better logging after test timeout, update test
Merge pull request #1655 from zombie/1003253-timeout-after

bug 1003253 - better logging after test timeout, update test, r=@Mossop