Merge remote-tracking branch 'upstream/master' into always_compare

Author: Cadair

pytest_mpl/plugin.py

@@ -499,8 +499,8 @@ def compare_image_to_hash_library(self, item, fig, result_dir):
                 hash_comparison_pass = True
             else:
                 error_message = (f"Hash {test_hash} doesn't match hash "
-                                f"{hash_library[hash_name]} in library "
-                                f"{hash_library_filename} for test {hash_name}.")
+                                 f"{hash_library[hash_name]} in library "
+                                 f"{hash_library_filename} for test {hash_name}.")
 
         # If the compare has only been specified with hash and not baseline
         # dir, don't attempt to find a baseline image at the default path.
@@ -512,24 +512,20 @@ def compare_image_to_hash_library(self, item, fig, result_dir):
             # Ignore Errors here as it's possible the reference image dosen't exist yet.
             try:
                 baseline_image_path = self.obtain_baseline_image(item, result_dir)
+                baseline_image = baseline_image_path
+                baseline_image = None if (baseline_image and not baseline_image.exists()) else baseline_image
                 # Get the baseline and generate a diff image, always so that
                 # --mpl-results-always can be respected.
                 baseline_comparison = self.compare_image_to_baseline(item, fig, result_dir)
-            except Exception as e:
-                warnings.warn(str(e))
-
-        try:
-            baseline_image = baseline_image_path
-            baseline_image = None if (baseline_image and not baseline_image.exists()) else baseline_image
-        except Exception:
-            baseline_image = None
+            except Exception as baseline_error:
+                baseline_image = None
 
         # If the hash comparison passes then return
         if hash_comparison_pass:
             return
 
         if baseline_image is None:
-            error_message += f"\nUnable to find baseline image {baseline_image_path or ''}."
+            error_message += f"\nUnable to find baseline image for {item}.\n{baseline_error}"
             return error_message
 
         # Override the tolerance (if not explicitly set) to 0 as the hashes are not forgiving

tests/baseline/hashes/mpl33_ft261.json

@@ -9,5 +9,5 @@
   "test_pytest_mpl.test_parametrized[5]": "04c998af2d7932ca4a851d610e8a020d94a2f623d1301dbe9b59fe6efd28a5f7",
   "test_pytest_mpl.test_parametrized[50]": "937d986ab6b209e7d48eb30cc30e9db62c93bbc4c86768e276a5b454e63bca93",
   "test_pytest_mpl.test_parametrized[500]": "e39ed724b0762b8736879801e32dc0c1525afd03c0567a43b119435aaa608498",
-  "test_pytest_mpl.test_hash_succeeds": "4150d2d146801b5feb41ef6bd022d5baabf4811c7f2e9ed72b639e80904243e1"
+  "test_pytest_mpl.test_hash_succeeds": "55ad74a44c99606f1df1e79f67a59a4986bddc2b48ea2b2d7ea8365db91dc7ca"
 }