Merge pull request #2082 from ei-grad/fix-pytest46-caplog

tests: fix for pytest>=4.6.0 caplog

setup.py

@@ -77,11 +77,11 @@ tests_requirements = [
     "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",

tests/func/test_add.py

@@ -114,7 +114,7 @@ class TestAddCmdDirectoryRecursive(TestDvc):
 
         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):

tests/func/test_data_cloud.py

@@ -870,12 +870,12 @@ class TestShouldWarnOnNoChecksumInLocalAndRemoteCache(TestDvc):
         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
         )