[pull] dev from home-assistant:dev

homeassistant/components/apcupsd/strings.json

@@ -14,7 +14,22 @@
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]"
         },
+        "data_description": {
+          "host": "The hostname or IP address of the APC UPS Daemon",
+          "port": "The port the APC UPS Daemon is listening on"
+        },
         "description": "Enter the host and port on which the apcupsd NIS is being served."
+      },
+      "reconfigure": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "port": "[%key:common::config_flow::data::port%]"
+        },
+        "data_description": {
+          "host": "[%key:component::apcupsd::config::step::user::data_description::host%]",
+          "port": "[%key:component::apcupsd::config::step::user::data_description::port%]"
+        },
+        "description": "[%key:component::apcupsd::config::step::user::description%]"
       }
     }
   },

homeassistant/components/opower/strings.json

@@ -10,7 +10,7 @@
         }
       },
       "credentials": {
-        "title": "Enter Credentials",
+        "title": "Enter credentials",
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
@@ -34,7 +34,7 @@
       },
       "mfa_code": {
         "title": "Enter security code",
-        "description": "A security code has been sent via your selected method. Please enter it below to complete login.",
+        "description": "Please enter the security code below to complete login.",
         "data": {
           "mfa_code": "Security code"
         },

tests/components/roborock/test_config_flow.py

@@ -199,7 +199,7 @@ async def test_config_flow_failures_code_login(
 
 
 async def test_options_flow_drawables(
-    hass: HomeAssistant, mock_roborock_entry: MockConfigEntry
+    hass: HomeAssistant, bypass_api_fixture, mock_roborock_entry: MockConfigEntry
 ) -> None:
     """Test that the options flow works."""
     with patch("homeassistant.components.roborock.roborock_storage"):

tests/components/tuya/conftest.py

@@ -145,7 +145,10 @@ async def mock_device(hass: HomeAssistant, mock_device_code: str) -> CustomerDev
         hass, f"{mock_device_code}.json", DOMAIN
     )
     device = MagicMock(spec=CustomerDevice)
-    device.id = details.get("id", "mocked_device_id")
+
+    # Use reverse of the product_id for testing
+    device.id = mock_device_code.replace("_", "")[::-1]
+
     device.name = details["name"]
     device.category = details["category"]
     device.product_id = details["product_id"]

tests/components/tuya/snapshots/test_alarm_control_panel.ambr

@@ -30,7 +30,7 @@
     'suggested_object_id': None,
     'supported_features': <AlarmControlPanelEntityFeature: 11>,
     'translation_key': None,
-    'unique_id': 'tuya.123123aba12312312dazubmaster_mode',
+    'unique_id': 'tuya.2pxfek1jjrtctiyglammaster_mode',
     'unit_of_measurement': None,
   })
 # ---

tests/components/tuya/snapshots/test_binary_sensor.ambr

@@ -30,7 +30,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': 'tuya.eb14fd1dd93ca2ea34vpinco2_state',
+    'unique_id': 'tuya.iks13mcaiyie3rryjb2occo2_state',
     'unit_of_measurement': None,
   })
 # ---
@@ -79,7 +79,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'defrost',
-    'unique_id': 'tuya.mock_device_iddefrost',
+    'unique_id': 'tuya.ifzgvpgoodrfw2akscdefrost',
     'unit_of_measurement': None,
   })
 # ---
@@ -128,7 +128,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'tankfull',
-    'unique_id': 'tuya.mock_device_idtankfull',
+    'unique_id': 'tuya.ifzgvpgoodrfw2aksctankfull',
     'unit_of_measurement': None,
   })
 # ---
@@ -177,7 +177,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'defrost',
-    'unique_id': 'tuya.bf3fce6af592f12df3gbgqdefrost',
+    'unique_id': 'tuya.2myxayqtud9aqbizscdefrost',
     'unit_of_measurement': None,
   })
 # ---
@@ -226,7 +226,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'tankfull',
-    'unique_id': 'tuya.bf3fce6af592f12df3gbgqtankfull',
+    'unique_id': 'tuya.2myxayqtud9aqbizsctankfull',
     'unit_of_measurement': None,
   })
 # ---
@@ -275,7 +275,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wet',
-    'unique_id': 'tuya.bf3fce6af592f12df3gbgqwet',
+    'unique_id': 'tuya.2myxayqtud9aqbizscwet',
     'unit_of_measurement': None,
   })
 # ---
@@ -324,7 +324,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': 'tuya.bf78687ad321a3aeb8a73mpresence_state',
+    'unique_id': 'tuya.kxwleaa2sphpresence_state',
     'unit_of_measurement': None,
   })
 # ---
@@ -373,7 +373,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': 'tuya.bf5cccf9027080e2dbb9w3switch',
+    'unique_id': 'tuya.bFFsO8HimyAJGIj7scmswitch',
     'unit_of_measurement': None,
   })
 # ---
@@ -422,7 +422,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': 'tuya.73486068483fda10d633pir',
+    'unique_id': 'tuya.hkm4px9ohzozxma3rippir',
     'unit_of_measurement': None,
   })
 # ---
@@ -471,7 +471,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': 'tuya.73486068483fda10d633temper_alarm',
+    'unique_id': 'tuya.hkm4px9ohzozxma3riptemper_alarm',
     'unit_of_measurement': None,
   })
 # ---
@@ -520,7 +520,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': 'tuya.bf445324326cbde7c5rg7bpir',
+    'unique_id': 'tuya.s3zzjdcfrippir',
     'unit_of_measurement': None,
   })
 # ---
@@ -569,7 +569,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': 'tuya.bf445324326cbde7c5rg7btemper_alarm',
+    'unique_id': 'tuya.s3zzjdcfriptemper_alarm',
     'unit_of_measurement': None,
   })
 # ---
@@ -618,7 +618,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': 'tuya.20401777500291cfe3a2pir',
+    'unique_id': 'tuya.zoytcemodrn39zqwrippir',
     'unit_of_measurement': None,
   })
 # ---
@@ -667,7 +667,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': 'tuya.ebb9d0eb5014f98cfboxbzgas_sensor_status',
+    'unique_id': 'tuya.cwwk68dyfsh2eqi4jbqrgas_sensor_status',
     'unit_of_measurement': None,
   })
 # ---
@@ -716,7 +716,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': 'tuya.bf58e095fd2d86d592tvehwatersensor_state',
+    'unique_id': 'tuya.codvtvgtjswatersensor_state',
     'unit_of_measurement': None,
   })
 # ---
@@ -765,7 +765,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': 'tuya.bf79ca977d67322eb2o68mmaster_state',
+    'unique_id': 'tuya.orotles4ucq8rxwn2gwmaster_state',
     'unit_of_measurement': None,
   })
 # ---
@@ -814,7 +814,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
-    'unique_id': 'tuya.8670375210521cf1349csmoke_sensor_status',
+    'unique_id': 'tuya.jfydgffzmhjed9fgjbwysmoke_sensor_status',
     'unit_of_measurement': None,
   })
 # ---

tests/components/tuya/snapshots/test_button.ambr

@@ -30,7 +30,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'reset_duster_cloth',
-    'unique_id': 'tuya.bfa951ca98fcf64fddqlmtreset_duster_cloth',
+    'unique_id': 'tuya.zrrraytdoanz33rldsreset_duster_cloth',
     'unit_of_measurement': None,
   })
 # ---
@@ -78,7 +78,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'reset_edge_brush',
-    'unique_id': 'tuya.bfa951ca98fcf64fddqlmtreset_edge_brush',
+    'unique_id': 'tuya.zrrraytdoanz33rldsreset_edge_brush',
     'unit_of_measurement': None,
   })
 # ---
@@ -126,7 +126,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'reset_filter',
-    'unique_id': 'tuya.bfa951ca98fcf64fddqlmtreset_filter',
+    'unique_id': 'tuya.zrrraytdoanz33rldsreset_filter',
     'unit_of_measurement': None,
   })
 # ---
@@ -174,7 +174,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'reset_map',
-    'unique_id': 'tuya.bfa951ca98fcf64fddqlmtreset_map',
+    'unique_id': 'tuya.zrrraytdoanz33rldsreset_map',
     'unit_of_measurement': None,
   })
 # ---
@@ -222,7 +222,7 @@
     'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'reset_roll_brush',
-    'unique_id': 'tuya.bfa951ca98fcf64fddqlmtreset_roll_brush',
+    'unique_id': 'tuya.zrrraytdoanz33rldsreset_roll_brush',
     'unit_of_measurement': None,
   })
 # ---

tests/components/tuya/snapshots/test_camera.ambr

@@ -30,7 +30,7 @@
     'suggested_object_id': None,
     'supported_features': <CameraEntityFeature: 2>,
     'translation_key': None,
-    'unique_id': 'tuya.bf7b8e59f8cd49f425mmfm',
+    'unique_id': 'tuya.mgcpxpmovasazerdps',
     'unit_of_measurement': None,
   })
 # ---
@@ -84,7 +84,7 @@
     'suggested_object_id': None,
     'supported_features': <CameraEntityFeature: 2>,
     'translation_key': None,
-    'unique_id': 'tuya.bf9d5b7ea61ea4c9a6rom9',
+    'unique_id': 'tuya.uBLyTOvlhoRWXKjrps',
     'unit_of_measurement': None,
   })
 # ---
@@ -137,7 +137,7 @@
     'suggested_object_id': None,
     'supported_features': <CameraEntityFeature: 2>,
     'translation_key': None,
-    'unique_id': 'tuya.bf3f8b448bbc123e29oghf',
+    'unique_id': 'tuya.fjdyw5ld2f5f5ddsps',
     'unit_of_measurement': None,
   })
 # ---

tests/components/tuya/snapshots/test_climate.ambr

@@ -42,7 +42,7 @@
     'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 393>,
     'translation_key': None,
-    'unique_id': 'tuya.mock_device_id',
+    'unique_id': 'tuya.mvsdcwtskkezlnw5tk',
     'unit_of_measurement': None,
   })
 # ---
@@ -117,7 +117,7 @@
     'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 401>,
     'translation_key': None,
-    'unique_id': 'tuya.bf3c2c83660b8e19e152jb',
+    'unique_id': 'tuya.dn7cjik6kw',
     'unit_of_measurement': None,
   })
 # ---
@@ -195,7 +195,7 @@
     'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 393>,
     'translation_key': None,
-    'unique_id': 'tuya.bf6fc1645146455a2efrex',
+    'unique_id': 'tuya.x7quooqakw',
     'unit_of_measurement': None,
   })
 # ---
@@ -269,7 +269,7 @@
     'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 385>,
     'translation_key': None,
-    'unique_id': 'tuya.bfb45cb8a9452fba66lexg',
+    'unique_id': 'tuya.j6mn1t4ut5end6ifkw',
     'unit_of_measurement': None,
   })
 # ---
@@ -336,7 +336,7 @@
     'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 385>,
     'translation_key': None,
-    'unique_id': 'tuya.bf1085bf049a74fcc1idy2',
+    'unique_id': 'tuya.sb3zdertrw50bgogkw',
     'unit_of_measurement': None,
   })
 # ---
@@ -403,7 +403,7 @@
     'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 385>,
     'translation_key': None,
-    'unique_id': 'tuya.bf8d64588f4a61965ezszs',
+    'unique_id': 'tuya.jm2fsqtzuhqtbo5ykw',
     'unit_of_measurement': None,
   })
 # ---