From 816364bfd925d0b0be3ddf09ec6593d8ac272edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 17 Feb 2019 10:55:33 +0200 Subject: [PATCH] Upgrade pytest to 4.2.1 (#21112) * Upgrade pytest to 4.2.0 * Upgrade pytest to 4.2.1 * Make litejet switch test work with pytest 4.2 --- requirements_test.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/switch/test_litejet.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements_test.txt b/requirements_test.txt index b9da9890c61..8e647010426 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -13,5 +13,5 @@ pytest-aiohttp==0.3.0 pytest-cov==2.6.1 pytest-sugar==0.9.2 pytest-timeout==1.3.3 -pytest==4.1.1 +pytest==4.2.1 requests_mock==1.5.2 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 40e7a37326d..6525bbda40d 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -14,7 +14,7 @@ pytest-aiohttp==0.3.0 pytest-cov==2.6.1 pytest-sugar==0.9.2 pytest-timeout==1.3.3 -pytest==4.1.1 +pytest==4.2.1 requests_mock==1.5.2 diff --git a/tests/components/switch/test_litejet.py b/tests/components/switch/test_litejet.py index f1d23f48b86..a35b6f760f3 100644 --- a/tests/components/switch/test_litejet.py +++ b/tests/components/switch/test_litejet.py @@ -53,9 +53,9 @@ class TestLiteJetSwitch(unittest.TestCase): 'port': '/tmp/this_will_be_mocked', } } - if method == self.test_include_switches_False: + if method == self.__class__.test_include_switches_False: config['litejet']['include_switches'] = False - elif method != self.test_include_switches_unspecified: + elif method != self.__class__.test_include_switches_unspecified: config['litejet']['include_switches'] = True assert setup.setup_component(self.hass, litejet.DOMAIN, config)