From 41461d4a6a350ee5167042c18ae806b9cf0f532f Mon Sep 17 00:00:00 2001 From: Alexander Schepanovski Date: Tue, 23 Apr 2019 16:59:35 +0700 Subject: [PATCH 1/2] test: use caplog.at_level() to restore log level after test --- tests/conftest.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 733a1bb2f3..e58eddd48f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,12 +3,13 @@ from git.exc import GitCommandNotFound from dvc.repo import Repo as DvcRepo -from .basic_env import TestDirFixture, logger +from .basic_env import TestDirFixture @pytest.fixture(autouse=True) -def debug(): - logger.setLevel("DEBUG") +def debug(caplog): + with caplog.at_level("DEBUG", logger="dvc"): + yield # Wrap class like fixture as pytest-like one to avoid code duplication From 95611ce9fe40c51c60b9dc5574ec217bdd095b16 Mon Sep 17 00:00:00 2001 From: Alexander Schepanovski Date: Tue, 23 Apr 2019 17:02:15 +0700 Subject: [PATCH 2/2] dvc: improve apply_diff() docstring - explain how it works and why is it needed - fix typo --- dvc/utils/collections.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dvc/utils/collections.py b/dvc/utils/collections.py index 2d7b259fa0..e1367d10a8 100644 --- a/dvc/utils/collections.py +++ b/dvc/utils/collections.py @@ -8,7 +8,14 @@ def compact(args): def apply_diff(src, dest): - """Recursively apply changes from stc to dest""" + """Recursively apply changes from src to dest. + + Preserves dest type and hidden info in dest structure, + like ruamel.yaml leaves when parses files. This includes comments, + ordering and line foldings. + + Used in Stage load/dump cycle to preserve comments and custom formatting. + """ Seq = (list, tuple) Container = (Mapping, list, tuple)