Try to run all tests at once.

mozilla-services · Aug 21, 2014 · 95afd8c · 95afd8c
1 parent 346fc7a
commit 95afd8c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -9,8 +9,8 @@ test: lint cover-mocha spaceleft
 
 .PHONY: travis
 travis: lint loadtests-check
-	@env NODE_ENV=test ./node_modules/mocha/bin/mocha test/* --reporter spec -ig websocket
-	@env NODE_ENV=test ./node_modules/mocha/bin/mocha test/* --reporter spec -g websocket -t 5000
+	@env NODE_ENV=test ./node_modules/mocha/bin/mocha test/* --reporter spec -t 5000
+# @env NODE_ENV=test ./node_modules/mocha/bin/mocha test/* --reporter spec -g websocket -t 5000
 
 install:
 	@npm install

diff --git a/loadtests/loadtest.py b/loadtests/loadtest.py
@@ -36,7 +36,7 @@ def test_all(self):
         token = self.generate_token()
         call_data = self.initiate_call(token)
         calls = self.list_pending_calls()
-        # self._test_websockets(token, call_data, calls)
+        self._test_websockets(token, call_data, calls)
 
     def _test_websockets(self, token, call_data, calls):
         progress_url = call_data['progressURL']
@@ -79,7 +79,6 @@ def _handle_caller(message_data):
                 callee_ws.receive()
 
             elif messageType == "progress" and state == "alerting":
-                gevent.sleep(25)
                 self._send_ws_message(
                     caller_ws,
                     messageType="action",