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

Fixed TestCaptureMethods

Browse source
This commit is contained in:
Joel Collins 2019-01-08 13:23:36 +00:00
parent af76442149
commit 3c34b43e32
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/test_camera.py
View file

@ -89,9 +89,9 @@ class TestCaptureMethods(unittest.TestCase):
dims = resize
else:
if use_video_port:
dims = camera.settings['video_resolution']
dims = camera.config['video_resolution']
else:
dims = camera.settings['image_resolution']
dims = camera.config['image_resolution']
# Ensure PIL image size matches expected size
print(image.size, dims)
@ -287,9 +287,9 @@ if __name__ == '__main__':
suites = [
unittest.TestLoader().loadTestsFromTestCase(TestCaptureMethods),
unittest.TestLoader().loadTestsFromTestCase(TestUnencodedMethods),
unittest.TestLoader().loadTestsFromTestCase(TestThreadStarting),
unittest.TestLoader().loadTestsFromTestCase(TestRecordMethods),
#unittest.TestLoader().loadTestsFromTestCase(TestUnencodedMethods),
#unittest.TestLoader().loadTestsFromTestCase(TestThreadStarting),
#unittest.TestLoader().loadTestsFromTestCase(TestRecordMethods),
]
alltests = unittest.TestSuite(suites)