From 71346760d05d90695bd7b500e95b382f7cbefe0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 27 Jun 2019 06:01:03 +0300 Subject: [PATCH] Upgrade pytest to 4.6.3 (#24782) * Upgrade pytest to 4.6.3 https://docs.pytest.org/en/latest/changelog.html#pytest-4-6-2-2019-06-03 https://docs.pytest.org/en/latest/changelog.html#pytest-4-6-3-2019-06-11 * Make litejet switch test work with pytest 4.6.3 Essentially reverts the corresponing change that was made for pytest 4.2 compatibility. --- requirements_test.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/litejet/test_switch.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements_test.txt b/requirements_test.txt index 78b990e294b..20cb1706209 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -14,5 +14,5 @@ pytest-aiohttp==0.3.0 pytest-cov==2.7.1 pytest-sugar==0.9.2 pytest-timeout==1.3.3 -pytest==4.6.1 +pytest==4.6.3 requests_mock==1.5.2 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index b6e1812195f..939327a3004 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -15,7 +15,7 @@ pytest-aiohttp==0.3.0 pytest-cov==2.7.1 pytest-sugar==0.9.2 pytest-timeout==1.3.3 -pytest==4.6.1 +pytest==4.6.3 requests_mock==1.5.2 diff --git a/tests/components/litejet/test_switch.py b/tests/components/litejet/test_switch.py index a35b6f760f3..f1d23f48b86 100644 --- a/tests/components/litejet/test_switch.py +++ b/tests/components/litejet/test_switch.py @@ -53,9 +53,9 @@ class TestLiteJetSwitch(unittest.TestCase): 'port': '/tmp/this_will_be_mocked', } } - if method == self.__class__.test_include_switches_False: + if method == self.test_include_switches_False: config['litejet']['include_switches'] = False - elif method != self.__class__.test_include_switches_unspecified: + elif method != self.test_include_switches_unspecified: config['litejet']['include_switches'] = True assert setup.setup_component(self.hass, litejet.DOMAIN, config)