Pull request #46: Bugfix/ensure pixel format is compatible for numpy access test

Merge in HSW_SDK/vmbpy from bugfix/ensure-pixel-format-is-compatible-for-numpy-access-test to dev

* commit 'c0d50fd70f710493ec3b1840558ea33c0946f616':
  Reset pixelformat after test case execution
  Set pixel format to compatible value if possible

Author: NiklasKroeger-AlliedVision

Tests/real_cam_tests/frame_test.py

@@ -181,13 +181,15 @@ def test_convert_to_all_given_formats(self):
         test_frames = []
 
         with self.cam:
+            initial_pixel_format = self.cam.get_pixel_format()
             for fmt in self.cam.get_pixel_formats():
                 self.cam.set_pixel_format(fmt)
 
                 frame = self.cam.get_frame()
 
                 self.assertEqual(fmt, frame.get_pixel_format())
                 test_frames.append(frame)
+            self.cam.set_pixel_format(initial_pixel_format)
 
         for frame in test_frames:
             original_fmt = frame.get_pixel_format()
@@ -223,8 +225,19 @@ def test_numpy_arrays_can_be_accessed_after_frame_is_garbage_collected(self):
         # PROCESS. THIS MEANS THAT THE TEST CASE WILL NOT REALLY REPORT A FAILURE, BUT SIMPLY EXIT
         # WITHOUT BEING MARKED AS PASSED. ALL SUBSEQUENT TEST CASES WILL ALSO NOT BE EXECUTED
         with self.cam:
+            compatible_formats = intersect_pixel_formats(OPENCV_PIXEL_FORMATS,
+                                                         self.cam.get_pixel_formats())
+            if not compatible_formats:
+                self.skipTest(f'Camera does not support a compatible format. Available formats '
+                              f'from camera are: {self.cam.get_pixel_formats()}. Numpy compatible '
+                              f'formats are {OPENCV_PIXEL_FORMATS}')
+            if self.cam.get_pixel_format() not in compatible_formats:
+                self.cam.set_pixel_format(compatible_formats[0])
             frame = self.cam.get_frame()
-        np_array = frame.as_numpy_ndarray()
+        try:
+            np_array = frame.as_numpy_ndarray()
+        except ImportError:
+            self.skipTest('Numpy is not imported')
         del frame
 
         # Ensure that garbage collection has cleaned up the frame object