Merge branch 4.x

modules/python/test/test_imread.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+
+'''
+Test for imread
+'''
+
+# Python 2/3 compatibility
+from __future__ import print_function
+
+import cv2 as cv
+import numpy as np
+import sys
+
+from tests_common import NewOpenCVTests
+
+class imread_test(NewOpenCVTests):
+    def test_imread_to_buffer(self):
+        path = self.extraTestDataPath + '/cv/shared/lena.png'
+        ref = cv.imread(path)
+
+        img = np.zeros_like(ref)
+        cv.imread(path, img)
+        self.assertEqual(cv.norm(ref, img, cv.NORM_INF), 0.0)
+
+
+if __name__ == '__main__':
+    NewOpenCVTests.bootstrap()

modules/python/test/test_pathlike.py

@@ -28,7 +28,7 @@ class CanPassPathLike(NewOpenCVTests):
     def test_type_mismatch(self):
         import_path() # checks python version
 
-        with self.assertRaises(TypeError) as context:
+        with self.assertRaises(cv.error) as context:
             cv.imread(123)
 
         self.assertTrue('str or path-like' in str(context.exception))