From a28af8bcc6e5ba1df09d957a8c9621e951c3c84e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 15 Jun 2017 16:01:26 +0100
Subject: [PATCH] Extend timeouts in joining tests again

this seems to work? maybe?
---
 test/app-tests/joining.js | 2 +-
 test/mock-request.js      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index 0aeb081a..d9670125 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -119,8 +119,8 @@ describe('joining a room', function () {
                 httpBackend.when('POST', '/publicRooms').respond(200, {chunk: []});
                 httpBackend.when('GET', '/thirdparty/protocols').respond(200, {});
                 return q.all([
-                    httpBackend.flush('/publicRooms'),
                     httpBackend.flush('/thirdparty/protocols'),
+                    httpBackend.flush('/publicRooms'),
                 ]);
             }).then(() => {
                 var roomDir = ReactTestUtils.findRenderedComponentWithType(
diff --git a/test/mock-request.js b/test/mock-request.js
index 46d16582..8b5b0e0a 100644
--- a/test/mock-request.js
+++ b/test/mock-request.js
@@ -37,7 +37,7 @@ HttpBackend.prototype = {
      * @param {string} path The path to flush (optional) default: all.
      * @param {integer} numToFlush The number of things to flush (optional), default: all.
      * @param {integer=} waitTime  The time (in ms) to wait for a request to happen.
-     *    default: 5
+     *    default: 100
      *
      * @return {Promise} resolves when there is nothing left to flush, with the
      *    number of requests flushed
@@ -47,7 +47,7 @@ HttpBackend.prototype = {
         const self = this;
         let flushed = 0;
         if (waitTime === undefined) {
-            waitTime = 10;
+            waitTime = 100;
         }
 
         function log(msg) {