From 55a601c07ea1384623c55d5c1d26b568df5d7823 Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull@gmail.com>
Date: Sat, 5 Feb 2022 14:30:20 -0800
Subject: [PATCH] Updated tests

---
 tests/test_cli.py | 103 ++++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 50 deletions(-)

diff --git a/tests/test_cli.py b/tests/test_cli.py
index 792b456a..92aa0004 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -6125,57 +6125,60 @@ def test_export_cleanup_exiftool_accented_album_name_same_filenames():
     runner = CliRunner()
     cwd = os.getcwd()
     # pylint: disable=not-context-manager
-    with tempfile.TemporaryDirectory() as tempdir:
-        result = runner.invoke(
-            export,
-            [
-                os.path.join(cwd, CLI_PHOTOS_DB),
-                tempdir,
-                "-V",
-                "--cleanup",
-                "--directory",
-                "{album[/,.|:,.]}",
-                "--exiftool",
-                "--exiftool-merge-keywords",
-                "--exiftool-merge-persons",
-                "--keyword-template",
-                "{keyword}",
-                "--report",
-                "test.csv",
-                "--skip-original-if-edited",
-                "--update",
-                "--touch-file",
-                "--not-hidden",
-            ],
-        )
-        assert "Deleted: 0 files, 0 directories" in result.output
+    with tempfile.TemporaryDirectory() as report_dir:
+        # keep report file out of of expor dir for --cleanup
+        report_file = os.path.join(report_dir, "test.csv")
+        with tempfile.TemporaryDirectory() as tempdir:
+            result = runner.invoke(
+                export,
+                [
+                    os.path.join(cwd, CLI_PHOTOS_DB),
+                    tempdir,
+                    "-V",
+                    "--cleanup",
+                    "--directory",
+                    "{album[/,.|:,.]}",
+                    "--exiftool",
+                    "--exiftool-merge-keywords",
+                    "--exiftool-merge-persons",
+                    "--keyword-template",
+                    "{keyword}",
+                    "--report",
+                    report_file,
+                    "--skip-original-if-edited",
+                    "--update",
+                    "--touch-file",
+                    "--not-hidden",
+                ],
+            )
+            assert "Deleted: 0 files, 0 directories" in result.output
 
-        # do it again
-        result = runner.invoke(
-            export,
-            [
-                os.path.join(cwd, CLI_PHOTOS_DB),
-                tempdir,
-                "-V",
-                "--cleanup",
-                "--directory",
-                "{album[/,.|:,.]}",
-                "--exiftool",
-                "--exiftool-merge-keywords",
-                "--exiftool-merge-persons",
-                "--keyword-template",
-                "{keyword}",
-                "--report",
-                "test.csv",
-                "--skip-original-if-edited",
-                "--update",
-                "--touch-file",
-                "--not-hidden",
-            ],
-        )
-        assert "exported: 0, updated: 0" in result.output
-        assert "updated EXIF data: 0" in result.output
-        assert "Deleted: 0 files, 0 directories" in result.output
+            # do it again
+            result = runner.invoke(
+                export,
+                [
+                    os.path.join(cwd, CLI_PHOTOS_DB),
+                    tempdir,
+                    "-V",
+                    "--cleanup",
+                    "--directory",
+                    "{album[/,.|:,.]}",
+                    "--exiftool",
+                    "--exiftool-merge-keywords",
+                    "--exiftool-merge-persons",
+                    "--keyword-template",
+                    "{keyword}",
+                    "--report",
+                    report_file,
+                    "--skip-original-if-edited",
+                    "--update",
+                    "--touch-file",
+                    "--not-hidden",
+                ],
+            )
+            assert "exported: 0, updated: 0" in result.output
+            assert "updated EXIF data: 0" in result.output
+            assert "Deleted: 0 files, 0 directories" in result.output
 
 
 def test_save_load_config():