Make "first generation" tests more explicit

home-assistant · Aug 18, 2021 · 144d861 · 144d861
1 parent 8f1f054
commit 144d861
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/tests/components/renault/test_device_tracker.py b/tests/components/renault/test_device_tracker.py
@@ -37,13 +37,13 @@ async def test_device_trackers(hass, vehicle_type):
         await setup_renault_integration_vehicle(hass, vehicle_type)
         await hass.async_block_till_done()
 
-    mock_vehicle = MOCK_VEHICLES[vehicle_type]
-    expected_entities = mock_vehicle[DEVICE_TRACKER_DOMAIN]
-    if len(expected_entities) == 0:
+    if vehicle_type == "zoe_40":
+        # first generation electric vehicles do not publish GPS position
         assert len(device_registry.devices) == 0
         assert len(entity_registry.entities) == 0
         return
 
+    mock_vehicle = MOCK_VEHICLES[vehicle_type]
     assert len(device_registry.devices) == 1
     expected_device = mock_vehicle["expected_device"]
     registry_entry = device_registry.async_get_device(expected_device[ATTR_IDENTIFIERS])
@@ -54,6 +54,7 @@ async def test_device_trackers(hass, vehicle_type):
     assert registry_entry.model == expected_device[ATTR_MODEL]
     assert registry_entry.sw_version == expected_device[ATTR_SW_VERSION]
 
+    expected_entities = mock_vehicle[DEVICE_TRACKER_DOMAIN]
     assert len(entity_registry.entities) == len(expected_entities)
     for expected_entity in expected_entities:
         entity_id = expected_entity["entity_id"]
@@ -77,13 +78,13 @@ async def test_device_tracker_empty(hass, vehicle_type):
         await setup_renault_integration_vehicle_with_no_data(hass, vehicle_type)
         await hass.async_block_till_done()
 
-    mock_vehicle = MOCK_VEHICLES[vehicle_type]
-    expected_entities = mock_vehicle[DEVICE_TRACKER_DOMAIN]
-    if len(expected_entities) == 0:
+    if vehicle_type == "zoe_40":
+        # first generation electric vehicles do not publish GPS position
         assert len(device_registry.devices) == 0
         assert len(entity_registry.entities) == 0
         return
 
+    mock_vehicle = MOCK_VEHICLES[vehicle_type]
     assert len(device_registry.devices) == 1
     expected_device = mock_vehicle["expected_device"]
     registry_entry = device_registry.async_get_device(expected_device[ATTR_IDENTIFIERS])
@@ -94,6 +95,7 @@ async def test_device_tracker_empty(hass, vehicle_type):
     assert registry_entry.model == expected_device[ATTR_MODEL]
     assert registry_entry.sw_version == expected_device[ATTR_SW_VERSION]
 
+    expected_entities = mock_vehicle[DEVICE_TRACKER_DOMAIN]
     assert len(entity_registry.entities) == len(expected_entities)
     for expected_entity in expected_entities:
         entity_id = expected_entity["entity_id"]
@@ -124,13 +126,13 @@ async def test_device_tracker_errors(hass, vehicle_type):
         )
         await hass.async_block_till_done()
 
-    mock_vehicle = MOCK_VEHICLES[vehicle_type]
-    expected_entities = mock_vehicle[DEVICE_TRACKER_DOMAIN]
-    if len(expected_entities) == 0:
+    if vehicle_type == "zoe_40":
+        # first generation electric vehicles do not publish GPS position
         assert len(device_registry.devices) == 0
         assert len(entity_registry.entities) == 0
         return
 
+    mock_vehicle = MOCK_VEHICLES[vehicle_type]
     assert len(device_registry.devices) == 1
     expected_device = mock_vehicle["expected_device"]
     registry_entry = device_registry.async_get_device(expected_device[ATTR_IDENTIFIERS])
@@ -141,6 +143,7 @@ async def test_device_tracker_errors(hass, vehicle_type):
     assert registry_entry.model == expected_device[ATTR_MODEL]
     assert registry_entry.sw_version == expected_device[ATTR_SW_VERSION]
 
+    expected_entities = mock_vehicle[DEVICE_TRACKER_DOMAIN]
     assert len(entity_registry.entities) == len(expected_entities)
     for expected_entity in expected_entities:
         entity_id = expected_entity["entity_id"]