Treat the waitTime passed into `flush` as a timeout rather than a
time-between-loops, so that we can pass in bigger times and not slow the tests
down too much.
Bump the timeout when waiting for /publicRooms and /initialSync in the joining
test.
Try to make it a bit more obvious what's been going on in mock-request: add
timestamps to lines, and an identifier so that where we have two flushes in
parallel, we can see what's what.
The karma tests don't pass yet, and aren't ready to land on develop.
This reverts commit 438453e61af74d38c7de57ac2d63317ed1f4a1ed, reversing
changes made to 50f94eb0402da92f8d6051ea53e4ee2d63a9663a.
