From 3f693322407ed1ecc7f65f9dc5ad1a566b7c1aa8 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 8 Jan 2019 13:25:46 +0000 Subject: [PATCH] Fixed TestUnencodedMethods --- tests/test_camera.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/test_camera.py b/tests/test_camera.py index 0219f58a..11719c37 100644 --- a/tests/test_camera.py +++ b/tests/test_camera.py @@ -144,7 +144,7 @@ class TestUnencodedMethods(unittest.TestCase): camera.wait_for_camera() # Capture RGB array - yuv = camera.array( + yuv = camera.yuv( use_video_port=use_video_port, resize=resize) @@ -156,9 +156,9 @@ class TestUnencodedMethods(unittest.TestCase): dims = resize else: if use_video_port: - dims = camera.settings['video_resolution'] + dims = camera.config['video_resolution'] else: - dims = camera.settings['numpy_resolution'] + dims = camera.config['numpy_resolution'] # Ensure array shape matches expected dimensions self.assertTrue(yuv.shape == (dims[1], dims[0], 3)) @@ -177,7 +177,6 @@ class TestUnencodedMethods(unittest.TestCase): # Capture RGB array rgb = camera.array( - rgb=True, use_video_port=use_video_port, resize=resize) @@ -189,9 +188,9 @@ class TestUnencodedMethods(unittest.TestCase): dims = resize else: if use_video_port: - dims = camera.settings['video_resolution'] + dims = camera.config['video_resolution'] else: - dims = camera.settings['numpy_resolution'] + dims = camera.config['numpy_resolution'] # Ensure array shape matches expected dimensions self.assertTrue(rgb.shape == (dims[1], dims[0], 3)) @@ -286,8 +285,8 @@ if __name__ == '__main__': camera = StreamingCamera() suites = [ - unittest.TestLoader().loadTestsFromTestCase(TestCaptureMethods), - #unittest.TestLoader().loadTestsFromTestCase(TestUnencodedMethods), + #unittest.TestLoader().loadTestsFromTestCase(TestCaptureMethods), + unittest.TestLoader().loadTestsFromTestCase(TestUnencodedMethods), #unittest.TestLoader().loadTestsFromTestCase(TestThreadStarting), #unittest.TestLoader().loadTestsFromTestCase(TestRecordMethods), ]