diff --git a/tests/components/alexa/test_smart_home.py b/tests/components/alexa/test_smart_home.py
index a0d40460373d7f3a55115932d19fae007160a4e5..87e3a94beb44b4c01df7152f317c1e7dfe316f39 100644
--- a/tests/components/alexa/test_smart_home.py
+++ b/tests/components/alexa/test_smart_home.py
@@ -167,7 +167,7 @@ def assert_endpoint_capabilities(endpoint, *interfaces):
them.
"""
capabilities = endpoint["capabilities"]
- supported = set(feature["interface"] for feature in capabilities)
+ supported = {feature["interface"] for feature in capabilities}
assert supported == set(interfaces)
return capabilities
diff --git a/tests/components/emulated_hue/test_hue_api.py b/tests/components/emulated_hue/test_hue_api.py
index 280ae56ea392310dd740949b8b3ecc48c0eefcaf..7ecad0183005658528c6d090ac8ed562d6441a05 100644
--- a/tests/components/emulated_hue/test_hue_api.py
+++ b/tests/components/emulated_hue/test_hue_api.py
@@ -181,7 +181,7 @@ async def test_discover_lights(hue_client):
result_json = await result.json()
- devices = set(val["uniqueid"] for val in result_json.values())
+ devices = {val["uniqueid"] for val in result_json.values()}
# Make sure the lights we added to the config are there
assert "00:2f:d2:31:ce:c5:55:cc-ee" in devices # light.ceiling_lights
diff --git a/tests/components/group/test_init.py b/tests/components/group/test_init.py
index e8878b7cf4aee04318aaccf8ff28d264402f9e3e..9cc75ff39aa29e180372ba9d25609ba96129b5e0 100644
--- a/tests/components/group/test_init.py
+++ b/tests/components/group/test_init.py
@@ -295,7 +295,7 @@ class TestComponentsGroup(unittest.TestCase):
group_state = self.hass.states.get(f"{group.DOMAIN}.second_group")
assert STATE_ON == group_state.state
- assert set((test_group.entity_id, "light.bowl")) == set(
+ assert {test_group.entity_id, "light.bowl"} == set(
group_state.attributes["entity_id"]
)
assert group_state.attributes.get(group.ATTR_AUTO) is None
@@ -304,7 +304,7 @@ class TestComponentsGroup(unittest.TestCase):
group_state = self.hass.states.get(f"{group.DOMAIN}.test_group")
assert STATE_UNKNOWN == group_state.state
- assert set(("sensor.happy", "hello.world")) == set(
+ assert {"sensor.happy", "hello.world"} == set(
group_state.attributes["entity_id"]
)
assert group_state.attributes.get(group.ATTR_AUTO) is None
diff --git a/tests/components/hue/test_bridge.py b/tests/components/hue/test_bridge.py
index 6ac68d222ebbe6c6c9ac662034b49de2b1f8d2a4..c122caf3760af6dc146a2a17a13b862a6c55ebad 100644
--- a/tests/components/hue/test_bridge.py
+++ b/tests/components/hue/test_bridge.py
@@ -23,8 +23,8 @@ async def test_bridge_setup(hass):
assert hue_bridge.api is api
assert len(mock_forward.mock_calls) == 3
- forward_entries = set(c[1][1] for c in mock_forward.mock_calls)
- assert forward_entries == set(["light", "binary_sensor", "sensor"])
+ forward_entries = {c[1][1] for c in mock_forward.mock_calls}
+ assert forward_entries == {"light", "binary_sensor", "sensor"}
async def test_bridge_setup_invalid_username(hass):
diff --git a/tests/components/mqtt/test_device_tracker.py b/tests/components/mqtt/test_device_tracker.py
index aa6d3efc828809bad286d9456d7aff46be0055f0..ababe8395f34be372a14003da54f6f88a99c5ebf 100644
--- a/tests/components/mqtt/test_device_tracker.py
+++ b/tests/components/mqtt/test_device_tracker.py
@@ -43,7 +43,7 @@ async def test_new_message(hass, mock_device_tracker_conf):
topic = "/location/paulus"
location = "work"
- hass.config.components = set(["mqtt", "zone"])
+ hass.config.components = {"mqtt", "zone"}
assert await async_setup_component(
hass, DOMAIN, {DOMAIN: {CONF_PLATFORM: "mqtt", "devices": {dev_id: topic}}}
)
@@ -60,7 +60,7 @@ async def test_single_level_wildcard_topic(hass, mock_device_tracker_conf):
topic = "/location/room/paulus"
location = "work"
- hass.config.components = set(["mqtt", "zone"])
+ hass.config.components = {"mqtt", "zone"}
assert await async_setup_component(
hass,
DOMAIN,
@@ -79,7 +79,7 @@ async def test_multi_level_wildcard_topic(hass, mock_device_tracker_conf):
topic = "/location/room/paulus"
location = "work"
- hass.config.components = set(["mqtt", "zone"])
+ hass.config.components = {"mqtt", "zone"}
assert await async_setup_component(
hass,
DOMAIN,
@@ -98,7 +98,7 @@ async def test_single_level_wildcard_topic_not_matching(hass, mock_device_tracke
topic = "/location/paulus"
location = "work"
- hass.config.components = set(["mqtt", "zone"])
+ hass.config.components = {"mqtt", "zone"}
assert await async_setup_component(
hass,
DOMAIN,
@@ -117,7 +117,7 @@ async def test_multi_level_wildcard_topic_not_matching(hass, mock_device_tracker
topic = "/somewhere/room/paulus"
location = "work"
- hass.config.components = set(["mqtt", "zone"])
+ hass.config.components = {"mqtt", "zone"}
assert await async_setup_component(
hass,
DOMAIN,
@@ -138,7 +138,7 @@ async def test_matching_custom_payload_for_home_and_not_home(
payload_home = "present"
payload_not_home = "not present"
- hass.config.components = set(["mqtt", "zone"])
+ hass.config.components = {"mqtt", "zone"}
assert await async_setup_component(
hass,
DOMAIN,
@@ -171,7 +171,7 @@ async def test_not_matching_custom_payload_for_home_and_not_home(
payload_not_home = "not present"
payload_not_matching = "test"
- hass.config.components = set(["mqtt", "zone"])
+ hass.config.components = {"mqtt", "zone"}
assert await async_setup_component(
hass,
DOMAIN,
@@ -198,7 +198,7 @@ async def test_matching_source_type(hass, mock_device_tracker_conf):
source_type = SOURCE_TYPE_BLUETOOTH
location = "work"
- hass.config.components = set(["mqtt", "zone"])
+ hass.config.components = {"mqtt", "zone"}
assert await async_setup_component(
hass,
DOMAIN,
diff --git a/tests/components/zha/test_discover.py b/tests/components/zha/test_discover.py
index e58fd740655ca7c8c107f773591a076f1e831aef..5996ca467f70283b7d9de93f1cd6dba04befe1a8 100644
--- a/tests/components/zha/test_discover.py
+++ b/tests/components/zha/test_discover.py
@@ -115,13 +115,9 @@ async def test_devices(
}
entity_map = device["entity_map"]
- assert zha_entity_ids == set(
- [
- e["entity_id"]
- for e in entity_map.values()
- if not e.get("default_match", False)
- ]
- )
+ assert zha_entity_ids == {
+ e["entity_id"] for e in entity_map.values() if not e.get("default_match", False)
+ }
assert event_channels == set(device["event_channels"])
for call in _dispatch.call_args_list:
@@ -133,7 +129,7 @@ async def test_devices(
assert entity_id is not None
no_tail_id = NO_TAIL_ID.sub("", entity_map[key]["entity_id"])
assert entity_id.startswith(no_tail_id)
- assert set([ch.name for ch in channels]) == set(entity_map[key]["channels"])
+ assert {ch.name for ch in channels} == set(entity_map[key]["channels"])
assert entity_cls.__name__ == entity_map[key]["entity_class"]
@@ -281,7 +277,7 @@ async def test_discover_endpoint(device_info, channels_mock, hass):
map_id = (comp, unique_id)
assert map_id in device_info["entity_map"]
entity_info = device_info["entity_map"][map_id]
- assert set([ch.name for ch in channels]) == set(entity_info["channels"])
+ assert {ch.name for ch in channels} == set(entity_info["channels"])
assert ent_cls.__name__ == entity_info["entity_class"]
diff --git a/tests/components/zha/test_registries.py b/tests/components/zha/test_registries.py
index 2612019f6fe4bc5956a245bca9e53c1999864408..b0f1a44a3d64fd28c38ae1ea52f102663313f393 100644
--- a/tests/components/zha/test_registries.py
+++ b/tests/components/zha/test_registries.py
@@ -221,7 +221,7 @@ def test_match_rule_claim_channels_color(channel):
rule = registries.MatchRule(channel_names="on_off", aux_channels={"color", "level"})
claimed = rule.claim_channels([ch_color, ch_level, ch_onoff])
- assert {"color", "level", "on_off"} == set([ch.name for ch in claimed])
+ assert {"color", "level", "on_off"} == {ch.name for ch in claimed}
@pytest.mark.parametrize(
@@ -253,7 +253,7 @@ def test_match_rule_claim_channels(rule, match, channel, channels):
channels.append(ch_power)
claimed = rule.claim_channels(channels)
- assert match == set([ch.name for ch in claimed])
+ assert match == {ch.name for ch in claimed}
@pytest.fixture
diff --git a/tests/helpers/test_init.py b/tests/helpers/test_init.py
index f27635d12086a43aded6144fae10d0ddef055ebe..5da6b21a3ff1b0c48c794efa6952dda9b48571d1 100644
--- a/tests/helpers/test_init.py
+++ b/tests/helpers/test_init.py
@@ -15,7 +15,7 @@ def test_extract_domain_configs():
"zone 100": None,
}
- assert set(["zone", "zone Hallo", "zone 100"]) == set(
+ assert {"zone", "zone Hallo", "zone 100"} == set(
helpers.extract_domain_configs(config, "zone")
)
diff --git a/tests/test_core.py b/tests/test_core.py
index deeb808396a8d2133958be26506977bfde1595cd..a28c8571f318927276b0b068a74c76b03509ca6a 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -920,7 +920,7 @@ class TestConfig(unittest.TestCase):
with TemporaryDirectory() as tmp_dir:
# The created dir is in /tmp. This is a symlink on OS X
# causing this test to fail unless we resolve path first.
- self.config.whitelist_external_dirs = set((os.path.realpath(tmp_dir),))
+ self.config.whitelist_external_dirs = {os.path.realpath(tmp_dir)}
test_file = os.path.join(tmp_dir, "test.jpg")
with open(test_file, "w") as tmp_file:
@@ -930,7 +930,7 @@ class TestConfig(unittest.TestCase):
for path in valid:
assert self.config.is_allowed_path(path)
- self.config.whitelist_external_dirs = set(("/home", "/var"))
+ self.config.whitelist_external_dirs = {"/home", "/var"}
unvalid = [
"/hass/config/secure",