Merge pull request #109 from dls-controls/new_controller

Some testing tweaks
dls-controls · Aug 3, 2016 · 8b93a1a · 8b93a1a
2 parents 16ba15b + 067af8b
commit 8b93a1a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -49,7 +49,7 @@ def get_version():
     license='APACHE',
     install_requires=['numpy', 'scanpointgenerator'],
     extras_require={
-        'zmq':  ['pyzmq']
+        'websocket':  ['tornado']
     },
     include_package_data=True,
     test_suite='nose.collector',

diff --git a/tests/test_comms/test_websocket/test_system_websocket.py b/tests/test_comms/test_websocket/test_system_websocket.py
@@ -1,6 +1,7 @@
 import os
 import sys
-sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
+sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
+import setup_malcolm_paths
 
 import time
 # logging

diff --git a/tests/test_comms/test_websocket/test_websocketclientcomms.py b/tests/test_comms/test_websocket/test_websocketclientcomms.py
@@ -1,6 +1,7 @@
 import os
 import sys
-sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
+sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
+import setup_malcolm_paths
 
 from collections import OrderedDict
 

diff --git a/tests/test_comms/test_websocket/test_websocketservercomms.py b/tests/test_comms/test_websocket/test_websocketservercomms.py
@@ -1,6 +1,7 @@
 import os
 import sys
-sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
+sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
+import setup_malcolm_paths
 
 from collections import OrderedDict