Merge branch 'master' into future

.noserc

@@ -0,0 +1,6 @@
+[nosetests]
+with-coverage=1
+cover-erase=1
+cover-inclusive=1
+cover-min-percentage=90
+cover-package=.

.travis.yml

@@ -1,14 +1,20 @@
 language: python
 python:
   - 2.7
+services:
+  - mongodb
+  - elasticsearch
+  - neo4j
 before_install:
-    - sudo apt-get install mongodb
     - sudo apt-get install python-dev
     - sudo apt-get install g++
     - sudo apt-get install libssl0.9.8
+    - sudo apt-get install libgeoip1
+    - sudo apt-get install libpcap0.8
     - wget https://github.com/SuperCowPowers/data/raw/master/packages/Bro-2.2-Linux-x86_64_flex.deb
     - sudo dpkg -i Bro-2.2-Linux-x86_64_flex.deb
     - export PATH=/opt/bro/bin:$PATH
+    - cp .noserc ~/.noserc
 install:
   - pip install -r requirements.txt
   - pip install coveralls

clients/stress_test.py → clients/timeout_corner/stress_test.py

@@ -53,10 +53,10 @@ def process_files(path):
     c.close()
 
 # Fixme: see https://github.com/SuperCowPowers/workbench/issues/40
-def disabled():
+def test():
     ''' stress_test test '''
     main()
 
 if __name__ == '__main__':
-    disabled()
+    test()
 

server/neo_db.py

@@ -18,7 +18,10 @@ def __init__(self, uri='http://localhost:7474/db/data'):
     def add_node(self, node_id, name, labels):
         ''' Add the node with name and labels '''
         node = self.graph_db.get_or_create_indexed_node('Node', 'node_id', node_id, {'node_id':node_id, 'name':name})
-        node.add_labels(*labels)
+        try:
+            node.add_labels(*labels)
+        except NotImplementedError:
+            print 'Got a NotImplementedError when adding labels. Upgrade your Neo4j DB!'
 
     def has_node(self, node_id):
         ''' Add the node with name and labels '''

server/workbench.py

@@ -513,7 +513,7 @@ def main():
         s.run()
         print 'ZeroRPC %s' % ('tcp://0.0.0.0:4242')
     except zmq.error.ZMQError:
-        print '\nInfo: Could not start ZMQ server (no worries, probably already running...)\n'
+        print '\nInfo: Could not start Workbench server (no worries, probably already running...)\n'
     except KeyboardInterrupt:
         print '\nWorbench Server Exiting...'
         exit()