Updated tests

This commit is contained in:
Joel Collins 2019-02-19 13:42:25 +00:00
parent cc3f7f19df
commit eb4e979d1c
2 changed files with 4 additions and 9 deletions

View file

@ -269,7 +269,6 @@ class TestThreadStarting(unittest.TestCase):
# Check Pi camera has been disconnected # Check Pi camera has been disconnected
self.assertTrue(camera.camera) self.assertTrue(camera.camera)
self.assertFalse(camera.thread)
# Restart worker thread # Restart worker thread
self.assertTrue(camera.start_worker()) self.assertTrue(camera.start_worker())

View file

@ -10,16 +10,10 @@ import unittest
import logging, sys import logging, sys
logging.basicConfig(stream=sys.stderr, level=logging.DEBUG) logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
OPENFLEXURERC = {
'plugins': [
'openflexure_microscope.plugins.testing:Plugin'
]
}
class TestPluginMethods(unittest.TestCase): class TestPluginMethods(unittest.TestCase):
def test_testplugin_load(self): def test_plugin_load(self):
plugin_arr = microscope.plugin.plugins plugin_arr = microscope.plugin.plugins
plugin_names = [plugin[0] for plugin in plugin_arr] plugin_names = [plugin[0] for plugin in plugin_arr]
@ -37,7 +31,9 @@ class TestPluginMethods(unittest.TestCase):
if __name__ == '__main__': if __name__ == '__main__':
with Microscope(StreamingCamera(), OpenFlexureStage("/dev/ttyUSB0"), OPENFLEXURERC) as microscope: with Microscope(StreamingCamera(), OpenFlexureStage("/dev/ttyUSB0")) as microscope:
microscope.plugin.attach("openflexure_microscope.plugins.testing:Plugin")
suites = [ suites = [
unittest.TestLoader().loadTestsFromTestCase(TestPluginMethods), unittest.TestLoader().loadTestsFromTestCase(TestPluginMethods),