From 63f43e9e699ade1b7ddd54e75946c134482551e3 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Wed, 20 May 2020 17:28:09 +0300 Subject: [PATCH] remote: is_dir_checksum: handle empty/None checksum Fixed #3434 --- dvc/remote/base.py | 2 ++ tests/unit/remote/test_base.py | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/dvc/remote/base.py b/dvc/remote/base.py index 0393391002..ec6c6a0dc3 100644 --- a/dvc/remote/base.py +++ b/dvc/remote/base.py @@ -319,6 +319,8 @@ def load_dir_cache(self, checksum): @classmethod def is_dir_checksum(cls, checksum): + if not checksum: + return False return checksum.endswith(cls.CHECKSUM_DIR_SUFFIX) def get_checksum(self, path_info): diff --git a/tests/unit/remote/test_base.py b/tests/unit/remote/test_base.py index 1e07589df0..c89b0474f9 100644 --- a/tests/unit/remote/test_base.py +++ b/tests/unit/remote/test_base.py @@ -136,3 +136,11 @@ def test_cache_checksums(dvc): ): checksums = list(remote.cache_checksums()) assert checksums == ["123456"] + + +@pytest.mark.parametrize( + "checksum, result", + [(None, False), ("", False), ("3456.dir", True), ("3456", False)], +) +def test_is_dir_checksum(checksum, result): + assert BaseRemote.is_dir_checksum(checksum) == result