Fix figures in HTML summary

Author: astrofrog

Diff for: pytest_mpl/plugin.py

@@ -483,7 +483,6 @@ def compare_image_to_baseline(self, item, fig, result_dir, summary=None):
 
         test_image = (result_dir / f"result.{ext}").absolute()
         fig.savefig(str(test_image), **savefig_kwargs)
-        summary['result_image'] = test_image.relative_to(self.results_dir).as_posix()
 
         if not os.path.exists(baseline_image_ref):
             summary['status'] = 'failed'
@@ -500,7 +499,6 @@ def compare_image_to_baseline(self, item, fig, result_dir, summary=None):
         # copy to our tmpdir to be sure to keep them in case of failure
         baseline_image = (result_dir / f"baseline.{ext}").absolute()
         shutil.copyfile(baseline_image_ref, baseline_image)
-        summary['baseline_image'] = baseline_image.relative_to(self.results_dir).as_posix()
 
         # Compare image size ourselves since the Matplotlib
         # exception is a bit cryptic in this case and doesn't show
@@ -520,6 +518,14 @@ def compare_image_to_baseline(self, item, fig, result_dir, summary=None):
                 return error_message
 
         results = compare_images(str(baseline_image), str(test_image), tol=tolerance, in_decorator=True)
+
+        if ext in ['png', 'svg']:  # Use original files
+            summary['result_image'] = test_image.relative_to(self.results_dir).as_posix()
+            summary['baseline_image'] = baseline_image.relative_to(self.results_dir).as_posix()
+        else:  # Use generated PNGs
+            summary['result_image'] = Path(results['actual']).relative_to(self.results_dir).as_posix()
+            summary['baseline_image'] = Path(results['expected']).relative_to(self.results_dir).as_posix()
+
         summary['tolerance'] = tolerance
         if results is None:
             summary['status'] = 'passed'
@@ -530,8 +536,7 @@ def compare_image_to_baseline(self, item, fig, result_dir, summary=None):
             summary['status'] = 'failed'
             summary['image_status'] = 'diff'
             summary['rms'] = results['rms']
-            diff_image = (result_dir / 'result-failed-diff.png').absolute()
-            summary['diff_image'] = diff_image.relative_to(self.results_dir).as_posix()
+            summary['diff_image'] = Path(results['diff']).relative_to(self.results_dir).as_posix()
             template = ['Error: Image files did not match.',
                         'RMS Value: {rms}',
                         'Expected:  \n    {expected}',
@@ -764,7 +769,7 @@ def pytest_unconfigure(self, config):
             if 'basic-html' in self.generate_summary:
                 summary = generate_summary_basic_html(self._test_results, self.results_dir,
                                                       **kwargs)
-                print(f"A summary of test results can be found at: {summary}")
+                print(f"A summar of test results can be found at: {summary}")
 
 
 class FigureCloser: