From 3aa9f51e367a9486686b22853b38d919d7f2e4cd Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 5 Mar 2023 23:12:07 +0200 Subject: [PATCH] output: suppress cloud.pull errors on cache collection Fixes https://github.com/iterative/studio/issues/5261 --- dvc/output.py | 4 +++- tests/unit/output/test_output.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dvc/output.py b/dvc/output.py index 9d53927b5..1316fb53a 100644 --- a/dvc/output.py +++ b/dvc/output.py @@ -2,6 +2,7 @@ import logging import os import posixpath from collections import defaultdict +from contextlib import suppress from operator import itemgetter from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple, Type from urllib.parse import urlparse @@ -1017,7 +1018,8 @@ class Output: except FileNotFoundError: if self.remote: kwargs["remote"] = self.remote - self.repo.cloud.pull([obj.hash_info], **kwargs) + with suppress(Exception): + self.repo.cloud.pull([obj.hash_info], **kwargs) if self.obj: return self.obj diff --git a/tests/unit/output/test_output.py b/tests/unit/output/test_output.py index ce543f9d2..d2c07ed88 100644 --- a/tests/unit/output/test_output.py +++ b/tests/unit/output/test_output.py @@ -116,7 +116,7 @@ def test_remote_missing_dependency_on_dir_pull(tmp_dir, scm, dvc, mocker): remove(dvc.cache.local.path) mocker.patch( - "dvc.data_cloud.DataCloud.get_remote_odb", + "dvc.data_cloud.DataCloud.get_remote", side_effect=RemoteMissingDepsError(dvc.fs, "azure", "azure://", []), ) with pytest.raises(RemoteMissingDepsError):