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

Fixed camera unit tests (may still be deprecated soon)

Browse source
This commit is contained in:
Joel Collins 2019-06-25 18:03:56 +01:00
parent 8f2b621ce5
commit 743f4aaf0f
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/test_camera.py
View file

@ -81,9 +81,9 @@ class TestCaptureMethods(unittest.TestCase):
dims = resize dims = resize
else: else:
if use_video_port: if use_video_port:
dims = camera.config['stream_resolution'] dims = camera.stream_resolution
else: else:
dims = camera.config['image_resolution'] dims = camera.image_resolution
# Ensure PIL image size matches expected size # Ensure PIL image size matches expected size
print(image.size, dims) print(image.size, dims)
@ -148,9 +148,9 @@ class TestUnencodedMethods(unittest.TestCase):
dims = resize dims = resize
else: else:
if use_video_port: if use_video_port:
dims = camera.config['stream_resolution'] dims = camera.stream_resolution
else: else:
dims = camera.config['numpy_resolution'] dims = camera.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))
@ -180,9 +180,9 @@ class TestUnencodedMethods(unittest.TestCase):
dims = resize dims = resize
else: else:
if use_video_port: if use_video_port:
dims = camera.config['stream_resolution'] dims = camera.stream_resolution
else: else:
dims = camera.config['numpy_resolution'] dims = camera.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))