Merge pull request #127 from BinaryAnalysisPlatform/blank_fix

Update socket.io version, fix phantomjs in Travis

middleware/qira_webserver.py

@@ -433,5 +433,9 @@ def run_server(largs, lprogram):
 
   print "****** starting WEB SERVER on %s:%d" % (qira_config.HOST, qira_config.WEB_PORT)
   threading.Thread(target=mwpoller).start()
-  socketio.run(app, host=qira_config.HOST, port=qira_config.WEB_PORT, log=open("/dev/null", "w"))
+  try:
+    socketio.run(app, host=qira_config.HOST, port=qira_config.WEB_PORT, log=open("/dev/null", "w"))
+  except KeyboardInterrupt:
+    print "*** User raised KeyboardInterrupt"
+    exit()
 

run_tests.sh

@@ -19,7 +19,14 @@ echo "qira pid is $QIRA_PID"
 sleep 2
 
 # phantomjs
-phantomjs qira_tests/load_page.js
+# use phantomjs2.0 for non-draft WebSockets protol
+# unforunately this doesn't ship with Ubuntu by default
+# the next 3 lines are 12.04 specific. maybe we should update Travis at some point
+sudo apt-get install libicu48
+wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
+tar xf ./phantomjs-2.0.0-ubuntu-12.04.tar.bz2
+chmod +x ./phantomjs
+./phantomjs qira_tests/load_page.js
 
 kill $QIRA_PID