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.
This commit is contained in:
Ville Skyttä 2019-06-27 06:01:03 +03:00 committed by Paulus Schoutsen
parent f6c1f336d4
commit 71346760d0
3 changed files with 4 additions and 4 deletions

View file

@ -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

View file

@ -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

View file

@ -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)