diff --git a/requirements_test.txt b/requirements_test.txt index 233856e8363d373f96e15bac3875b513482cd9f8..a996ef411c37ad85087dacdf6ab36ffcfd41c7f9 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,11 +1,10 @@ -flake8>=2.6.0 +flake8>=3.0.4 pylint>=1.5.6 -astroid>=1.4.8 coveralls>=1.1 pytest>=2.9.2 -pytest-cov>=2.2.1 +pytest-cov>=2.3.1 pytest-timeout>=1.0.0 -pytest-capturelog>=0.7 +pytest-catchlog>=1.2.2 pydocstyle>=1.0.0 requests_mock>=1.0 mypy-lang>=0.4 diff --git a/setup.cfg b/setup.cfg index b11dfac0c4205377cf4820fc36866be08b49756f..98a4f54d55da2feae0e1609daa583724d2978e40 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [wheel] universal = 1 -[pytest] +[tool:pytest] testpaths = tests norecursedirs = .git testing_config diff --git a/tests/components/test_http.py b/tests/components/test_http.py index 7a6d7af673fee1310183ba9a365b36d88737b480..ef491a91b360f86d3c6ff3dc5568654a8cd7743b 100644 --- a/tests/components/test_http.py +++ b/tests/components/test_http.py @@ -75,8 +75,8 @@ class TestHttp: def test_access_with_password_in_header(self, caplog): """Test access with password in URL.""" # Hide logging from requests package that we use to test logging - caplog.setLevel(logging.WARNING, - logger='requests.packages.urllib3.connectionpool') + caplog.set_level(logging.WARNING, + logger='requests.packages.urllib3.connectionpool') req = requests.get( _url(const.URL_API), @@ -84,7 +84,7 @@ class TestHttp: assert req.status_code == 200 - logs = caplog.text() + logs = caplog.text # assert const.URL_API in logs assert API_PASSWORD not in logs @@ -99,15 +99,15 @@ class TestHttp: def test_access_with_password_in_url(self, caplog): """Test access with password in URL.""" # Hide logging from requests package that we use to test logging - caplog.setLevel(logging.WARNING, - logger='requests.packages.urllib3.connectionpool') + caplog.set_level(logging.WARNING, + logger='requests.packages.urllib3.connectionpool') req = requests.get(_url(const.URL_API), params={'api_password': API_PASSWORD}) assert req.status_code == 200 - logs = caplog.text() + logs = caplog.text # assert const.URL_API in logs assert API_PASSWORD not in logs