Skip to content

tests: fix for pytest>=4.6.0 caplog #2082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ def run(self):
"wheel>=0.31.1",
"pydot>=1.2.4",
# Test requirements:
"pytest==4.4.0",
"pytest-timeout==1.3.3",
"pytest-cov==2.6.1",
"pytest-xdist==1.26.1",
"pytest-mock==1.10.4",
"pytest>=4.6.0",
"pytest-timeout>=1.3.3",
"pytest-cov>=2.6.1",
"pytest-xdist>=1.26.1",
"pytest-mock>=1.10.4",
"flaky>=3.5.3",
"mock>=3.0.0",
"xmltodict>=0.11.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/func/test_add.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def test_warn_about_large_directories(self):

with self._caplog.at_level(logging.WARNING, logger="dvc"):
assert main(["add", "--recursive", "large-dir"]) == 0
assert warning in self._caplog.text
assert warning in self._caplog.messages


class TestAddDirectoryWithForwardSlash(TestDvc):
Expand Down
6 changes: 3 additions & 3 deletions tests/func/test_data_cloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -870,12 +870,12 @@ def setUp(self):
checksum_bar = file_md5(self.BAR)[0]
self.message_header = (
"Some of the cache files do not exist neither locally "
"nor on remote. Missing cache files: \n"
"nor on remote. Missing cache files: "
)
self.message_bar_part = "\nname: {}, md5: {}\n".format(
self.message_bar_part = "name: {}, md5: {}".format(
self.BAR, checksum_bar
)
self.message_foo_part = "\nname: {}, md5: {}\n".format(
self.message_foo_part = "name: {}, md5: {}".format(
self.FOO, checksum_foo
)

Expand Down