Updated tests

This commit is contained in:
Rhet Turnbull
2022-02-05 14:30:20 -08:00
parent 7d67b81879
commit 55a601c07e

View File

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