rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed TestUnencodedMethods

Browse source
This commit is contained in:
Joel Collins 2019-01-08 13:25:46 +00:00
parent 3c34b43e32
commit 3f69332240
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/test_camera.py
View file

@ -144,7 +144,7 @@ class TestUnencodedMethods(unittest.TestCase):
camera.wait_for_camera() camera.wait_for_camera()
# Capture RGB array # Capture RGB array
yuv = camera.array( yuv = camera.yuv(
use_video_port=use_video_port, use_video_port=use_video_port,
resize=resize) resize=resize)
@ -156,9 +156,9 @@ class TestUnencodedMethods(unittest.TestCase):
dims = resize dims = resize
else: else:
if use_video_port: if use_video_port:
dims = camera.settings['video_resolution'] dims = camera.config['video_resolution']
else: else:
dims = camera.settings['numpy_resolution'] dims = camera.config['numpy_resolution']
# Ensure array shape matches expected dimensions # Ensure array shape matches expected dimensions
self.assertTrue(yuv.shape == (dims[1], dims[0], 3)) self.assertTrue(yuv.shape == (dims[1], dims[0], 3))
@ -177,7 +177,6 @@ class TestUnencodedMethods(unittest.TestCase):
# Capture RGB array # Capture RGB array
rgb = camera.array( rgb = camera.array(
rgb=True,
use_video_port=use_video_port, use_video_port=use_video_port,
resize=resize) resize=resize)
@ -189,9 +188,9 @@ class TestUnencodedMethods(unittest.TestCase):
dims = resize dims = resize
else: else:
if use_video_port: if use_video_port:
dims = camera.settings['video_resolution'] dims = camera.config['video_resolution']
else: else:
dims = camera.settings['numpy_resolution'] dims = camera.config['numpy_resolution']
# Ensure array shape matches expected dimensions # Ensure array shape matches expected dimensions
self.assertTrue(rgb.shape == (dims[1], dims[0], 3)) self.assertTrue(rgb.shape == (dims[1], dims[0], 3))
@ -286,8 +285,8 @@ if __name__ == '__main__':
camera = StreamingCamera() camera = StreamingCamera()
suites = [ suites = [
unittest.TestLoader().loadTestsFromTestCase(TestCaptureMethods), #unittest.TestLoader().loadTestsFromTestCase(TestCaptureMethods),
#unittest.TestLoader().loadTestsFromTestCase(TestUnencodedMethods), unittest.TestLoader().loadTestsFromTestCase(TestUnencodedMethods),
#unittest.TestLoader().loadTestsFromTestCase(TestThreadStarting), #unittest.TestLoader().loadTestsFromTestCase(TestThreadStarting),
#unittest.TestLoader().loadTestsFromTestCase(TestRecordMethods), #unittest.TestLoader().loadTestsFromTestCase(TestRecordMethods),
] ]