Generate baseline with full path for tox

Author: ConorMacBride

tests/subtests/subtest.py

@@ -84,23 +84,24 @@ def test_hdiff_imatch_savefig():
     return plot([1, 2, 3, 4])
 
 
-# Different baseline directory
-# TODO: Test with a remote `baseline_dir`
-@pytest.mark.mpl_image_compare(baseline_dir='baseline/other')
-def test_hdiff_imatch_baselinedir():
-    return plot([4, 2, 1, 4])
-
-
-# Different filename
-@pytest.mark.mpl_image_compare(filename='test_hdiff_imatch_filename_other.png')
-def test_hdiff_imatch_filename():
-    return plot([4, 2, 1, 4])
-
-
-# Different hash library
-@pytest.mark.mpl_image_compare(hash_library='hashes/other/other.json')
-def test_hdiff_imatch_filename():
-    return plot([4, 2, 1, 4])
+# TODO: Implement these path altering tests later
+# # Different baseline directory
+# # TODO: Test with a remote `baseline_dir`
+# @pytest.mark.mpl_image_compare(baseline_dir='baseline/other')
+# def test_hdiff_imatch_baselinedir():
+#     return plot([4, 2, 1, 4])
+#
+#
+# # Different filename
+# @pytest.mark.mpl_image_compare(filename='test_hdiff_imatch_filename_other.png')
+# def test_hdiff_imatch_filename():
+#     return plot([4, 2, 1, 4])
+#
+#
+# # Different hash library
+# @pytest.mark.mpl_image_compare(hash_library='hashes/other/other.json')
+# def test_hdiff_imatch_hashlibrary():
+#     return plot([4, 2, 1, 4])
 
 
 # Different style

tests/subtests/test_subtest.py

@@ -17,6 +17,7 @@
 HASH_LIBRARY = Path(__file__).parent / 'hashes' / (VERSION_ID + ".json")
 RESULT_LIBRARY = Path(__file__).parent / 'result_hashes' / (VERSION_ID + ".json")
 HASH_LIBRARY_FLAG = rf'--mpl-hash-library={HASH_LIBRARY}'
+FULL_BASELINE_PATH = Path(__file__).parent / 'baseline'
 
 BASELINE_IMAGES_FLAG = '--mpl-baseline-path=baseline'
 
@@ -62,7 +63,7 @@ def run_subtest(baseline_summary_name, tmp_path, args, summaries=None, xfail=Tru
     mpl_args = ['--mpl', rf'--mpl-results-path={results_path.as_posix()}',
                 f'--mpl-generate-summary={summaries}']
     if update_baseline:
-        mpl_args += ['--mpl-generate-path=baseline']
+        mpl_args += [rf'--mpl-generate-path={FULL_BASELINE_PATH}']
         if HASH_LIBRARY.exists():
             mpl_args += [rf'--mpl-generate-hash-library={HASH_LIBRARY}']
 
@@ -72,6 +73,9 @@ def run_subtest(baseline_summary_name, tmp_path, args, summaries=None, xfail=Tru
     # If updating baseline, don't check summaries
     if update_baseline:
         assert status == 0
+        if HASH_LIBRARY.exists():
+            # Keep in sync. Use `git add -p` to commit specific lines.
+            shutil.copy(HASH_LIBRARY, RESULT_LIBRARY)
         return
 
     # Ensure exit status is as expected