Add test util to handle common operations

Also adds requirement to numpy, needed for NumberMeta.

setup.py

@@ -47,7 +47,7 @@ def get_version():
         'Programming Language :: Python :: 3.5',
     ],
     license='APACHE',
-    install_requires=[],
+    install_requires=['numpy'],
     extras_require={
         'zmq':  ['pyzmq']
     },

tests/test_controllers/test_clientcontroller.py

@@ -1,12 +1,7 @@
 import unittest
 from collections import OrderedDict
-import sys
-import os
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-# mock
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import MagicMock, patch
 
 # logging

tests/test_controllers/test_hellocontroller.py

@@ -1,10 +1,6 @@
 import unittest
-import sys
-import os
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import Mock
 
 from malcolm.controllers.hellocontroller import HelloController

tests/test_controllers/util.py

@@ -0,0 +1 @@
+../test_core/util.py

tests/test_core/test_attribute.py

@@ -1,11 +1,7 @@
-import sys
-import os
 import unittest
 from collections import OrderedDict
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import Mock, patch
 
 from malcolm.core.attribute import Attribute

tests/test_core/test_attributemeta.py

@@ -1,11 +1,6 @@
-import sys
-import os
+from . import util
 import unittest
 from collections import OrderedDict
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
-
-from pkg_resources import require
-require("mock")
 from mock import MagicMock
 
 from malcolm.core.attributemeta import AttributeMeta

tests/test_core/test_block.py

@@ -1,12 +1,7 @@
 import unittest
 from collections import OrderedDict
-import sys
-import os
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-# mock
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import MagicMock, patch
 
 # module imports

tests/test_core/test_clientcomms.py

@@ -1,11 +1,7 @@
 import unittest
-import sys
-import os
 from collections import OrderedDict
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import Mock
 
 from malcolm.core.clientcomms import ClientComms, CLIENT_STOP

tests/test_core/test_controller.py

@@ -1,11 +1,6 @@
 import unittest
-import sys
-import os
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-# mock
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import MagicMock, call
 
 # module imports

tests/test_core/test_loggable.py

@@ -1,14 +1,8 @@
 import unittest
-import sys
-import os
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-# mock
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import patch
 
-# module imports
 from malcolm.core.loggable import Loggable
 
 

tests/test_core/test_mapmeta.py

@@ -1,11 +1,7 @@
 import unittest
-import os
-import sys
 from collections import OrderedDict
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import MagicMock, patch, call
 
 from malcolm.core.mapmeta import MapMeta

tests/test_core/test_method.py

@@ -1,11 +1,7 @@
 import unittest
-import sys
-import os
 from collections import OrderedDict
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import Mock, patch, call, MagicMock
 
 from malcolm.core.method import Method, takes, returns

tests/test_core/test_monitorable.py

@@ -1,10 +1,6 @@
 import unittest
-import sys
-import os
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import Mock
 
 from malcolm.core.monitorable import Monitorable

tests/test_core/test_process.py

@@ -1,14 +1,9 @@
 import unittest
-import sys
-import os
 from collections import OrderedDict
 # import logging
 # logging.basicConfig(level=logging.DEBUG)
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-# mock
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import MagicMock
 
 # module imports

tests/test_core/test_request.py

@@ -1,12 +1,7 @@
 import unittest
 from collections import OrderedDict
-import sys
-import os
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-# mock
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import MagicMock, patch
 
 from malcolm.core.request import Request

tests/test_core/test_response.py

@@ -1,11 +1,7 @@
 import unittest
-import sys
-import os
 from collections import OrderedDict
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import Mock, MagicMock
 
 from malcolm.core.response import Response

tests/test_core/test_servercomms.py

@@ -1,10 +1,6 @@
 import unittest
-import sys
-import os
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import Mock
 
 from malcolm.core.servercomms import ServerComms, SERVER_STOP

tests/test_core/test_stringmeta.py

@@ -1,8 +1,7 @@
-import sys
-import os
 import unittest
 from collections import OrderedDict
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
+
+from . import util
 
 from malcolm.core.stringmeta import StringMeta
 from malcolm.core.attributemeta import AttributeMeta

tests/test_core/test_syncfactory.py

@@ -1,11 +1,6 @@
 import unittest
-import sys
-import os
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
-# mock
-from pkg_resources import require
-require("mock")
+from . import util
 from mock import patch
 
 # module imports

tests/test_core/test_system_core.py

@@ -1,7 +1,6 @@
 import unittest
-import sys
-import os
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
+
+from . import util
 
 # logging
 # import logging

tests/test_core/util.py

@@ -0,0 +1,6 @@
+import sys
+import os
+sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
+
+from pkg_resources import require
+require("mock", "numpy")

tests/test_wscomms/test_system_wscomms.py

@@ -1,8 +1,7 @@
 import unittest
-import sys
-import os
 import time
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
+
+from . import util
 
 # logging
 # import logging

tests/test_wscomms/test_wsclientcomms.py

@@ -1,11 +1,8 @@
+from . import util
 import unittest
-import os
-import sys
 from collections import OrderedDict
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
 from pkg_resources import require
-require("mock")
 require('tornado')
 from mock import MagicMock, patch
 
@@ -96,5 +93,6 @@ def test_stop(self, ioloop_mock, _):
         loop_mock.add_callback.assert_called_once_with(ioloop_mock.current().stop)
         self.WS._loop_spawned.wait.assert_called_once_with()
 
+
 if __name__ == "__main__":
     unittest.main(verbosity=2)

tests/test_wscomms/test_wsservercomms.py

@@ -1,11 +1,8 @@
 import unittest
 from collections import OrderedDict
-import sys
-import os
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
 
+from . import util
 from pkg_resources import require
-require("mock")
 require('tornado')
 from mock import MagicMock, patch
 

tests/test_wscomms/util.py

@@ -0,0 +1 @@
+../test_core/util.py