Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove name in Minecraft Server config entry (#139113) 

* Remove CONF_NAME in config entry

* Revert config entry version from 4 back to 3

* Add data_description for address in strings.json

* Use config entry title as coordinator name

* Use constant as mock config entry title
pull/139200/head
elmurato 2025-02-24 18:02:18 +01:00 committed by GitHub
parent ec3f5561dc
commit 60479369b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 118 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/minecraft_server/config_flow.py
View File

@ -8,10 +8,10 @@ from typing import Any
import voluptuous as vol
from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
from homeassistant.const import CONF_ADDRESS, CONF_NAME, CONF_TYPE
from homeassistant.const import CONF_ADDRESS, CONF_TYPE
from .api import MinecraftServer, MinecraftServerAddressError, MinecraftServerType
from .const import DEFAULT_NAME, DOMAIN
from .const import DOMAIN
DEFAULT_ADDRESS = "localhost:25565"
@ -37,7 +37,6 @@ class MinecraftServerConfigFlow(ConfigFlow, domain=DOMAIN):
# Prepare config entry data.
config_data = {
CONF_NAME: user_input[CONF_NAME],
CONF_ADDRESS: address,
}
@ -78,9 +77,6 @@ class MinecraftServerConfigFlow(ConfigFlow, domain=DOMAIN):
step_id="user",
data_schema=vol.Schema(
{
vol.Required(
CONF_NAME, default=user_input.get(CONF_NAME, DEFAULT_NAME)
): str,
vol.Required(
CONF_ADDRESS,
default=user_input.get(CONF_ADDRESS, DEFAULT_ADDRESS),

2
homeassistant/components/minecraft_server/const.py
View File

@ -1,7 +1,5 @@
"""Constants for the Minecraft Server integration."""
DEFAULT_NAME = "Minecraft Server"
DOMAIN = "minecraft_server"
KEY_LATENCY = "latency"

4
homeassistant/components/minecraft_server/coordinator.py
View File

@ -6,7 +6,7 @@ from datetime import timedelta
import logging
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_ADDRESS, CONF_NAME, CONF_TYPE
from homeassistant.const import CONF_ADDRESS, CONF_TYPE
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryNotReady
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@ -42,7 +42,7 @@ class MinecraftServerCoordinator(DataUpdateCoordinator[MinecraftServerData]):
super().__init__(
hass=hass,
name=config_entry.data[CONF_NAME],
name=config_entry.title,
config_entry=config_entry,
logger=_LOGGER,
update_interval=SCAN_INTERVAL,

4
homeassistant/components/minecraft_server/diagnostics.py
View File

@ -5,12 +5,12 @@ from dataclasses import asdict
from typing import Any
from homeassistant.components.diagnostics import async_redact_data
from homeassistant.const import CONF_ADDRESS, CONF_NAME
from homeassistant.const import CONF_ADDRESS
from homeassistant.core import HomeAssistant
from .coordinator import MinecraftServerConfigEntry
TO_REDACT: Iterable[Any] = {CONF_ADDRESS, CONF_NAME, "players_list"}
TO_REDACT: Iterable[Any] = {CONF_ADDRESS, "players_list"}
async def async_get_config_entry_diagnostics(

4
homeassistant/components/minecraft_server/quality_scale.yaml
View File

@ -6,9 +6,7 @@ rules:
appropriate-polling: done
brands: done
common-modules: done
config-flow:
status: todo
comment: Check removal and replacement of name in config flow with the title (server address).
config-flow: done
config-flow-test-coverage:
status: todo
comment: |

10
homeassistant/components/minecraft_server/strings.json
View File

@ -2,12 +2,14 @@
"config": {
"step": {
"user": {
"title": "Link your Minecraft Server",
"description": "Set up your Minecraft Server instance to allow monitoring.",
"data": {
"name": "[%key:common::config_flow::data::name%]",
"address": "Server address"
}
},
"data_description": {
"address": "The hostname, IP address or SRV record of your Minecraft server, optionally including the port."
},
"title": "Link your Minecraft Server",
"description": "Set up your Minecraft Server instance to allow monitoring."
}
},
"abort": {

8
tests/components/minecraft_server/conftest.py
View File

@ -3,8 +3,8 @@
import pytest
from homeassistant.components.minecraft_server.api import MinecraftServerType
from homeassistant.components.minecraft_server.const import DEFAULT_NAME, DOMAIN
from homeassistant.const import CONF_ADDRESS, CONF_NAME, CONF_TYPE
from homeassistant.components.minecraft_server.const import DOMAIN
from homeassistant.const import CONF_ADDRESS, CONF_TYPE
from .const import TEST_ADDRESS, TEST_CONFIG_ENTRY_ID
@ -18,8 +18,8 @@ def java_mock_config_entry() -> MockConfigEntry:
domain=DOMAIN,
unique_id=None,
entry_id=TEST_CONFIG_ENTRY_ID,
title=TEST_ADDRESS,
data={
CONF_NAME: DEFAULT_NAME,
CONF_ADDRESS: TEST_ADDRESS,
CONF_TYPE: MinecraftServerType.JAVA_EDITION,
},
@ -34,8 +34,8 @@ def bedrock_mock_config_entry() -> MockConfigEntry:
domain=DOMAIN,
unique_id=None,
entry_id=TEST_CONFIG_ENTRY_ID,
title=TEST_ADDRESS,
data={
CONF_NAME: DEFAULT_NAME,
CONF_ADDRESS: TEST_ADDRESS,
CONF_TYPE: MinecraftServerType.BEDROCK_EDITION,
},

16
tests/components/minecraft_server/snapshots/test_binary_sensor.ambr
View File

@ -3,10 +3,10 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'connectivity',
'friendly_name': 'Minecraft Server Status',
'friendly_name': 'mc.dummyserver.com:25566 Status',
}),
'context': <ANY>,
'entity_id': 'binary_sensor.minecraft_server_status',
'entity_id': 'binary_sensor.mc_dummyserver_com_25566_status',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -17,10 +17,10 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'connectivity',
'friendly_name': 'Minecraft Server Status',
'friendly_name': 'mc.dummyserver.com:25566 Status',
}),
'context': <ANY>,
'entity_id': 'binary_sensor.minecraft_server_status',
'entity_id': 'binary_sensor.mc_dummyserver_com_25566_status',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -31,10 +31,10 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'connectivity',
'friendly_name': 'Minecraft Server Status',
'friendly_name': 'mc.dummyserver.com:25566 Status',
}),
'context': <ANY>,
'entity_id': 'binary_sensor.minecraft_server_status',
'entity_id': 'binary_sensor.mc_dummyserver_com_25566_status',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -45,10 +45,10 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'connectivity',
'friendly_name': 'Minecraft Server Status',
'friendly_name': 'mc.dummyserver.com:25566 Status',
}),
'context': <ANY>,
'entity_id': 'binary_sensor.minecraft_server_status',
'entity_id': 'binary_sensor.mc_dummyserver_com_25566_status',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,

2
tests/components/minecraft_server/snapshots/test_diagnostics.ambr
View File

@ -8,7 +8,6 @@
}),
'config_entry_data': dict({
'address': '**REDACTED**',
'name': '**REDACTED**',
'type': 'Bedrock Edition',
}),
'config_entry_options': dict({
@ -36,7 +35,6 @@
}),
'config_entry_data': dict({
'address': '**REDACTED**',
'name': '**REDACTED**',
'type': 'Java Edition',
}),
'config_entry_options': dict({

120
tests/components/minecraft_server/snapshots/test_sensor.ambr
View File

@ -2,11 +2,11 @@
# name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Latency',
'friendly_name': 'mc.dummyserver.com:25566 Latency',
'unit_of_measurement': <UnitOfTime.MILLISECONDS: 'ms'>,
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_latency',
'entity_id': 'sensor.mc_dummyserver_com_25566_latency',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -16,11 +16,11 @@
# name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].1
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Players online',
'friendly_name': 'mc.dummyserver.com:25566 Players online',
'unit_of_measurement': 'players',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_players_online',
'entity_id': 'sensor.mc_dummyserver_com_25566_players_online',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -30,11 +30,11 @@
# name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].2
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Players max',
'friendly_name': 'mc.dummyserver.com:25566 Players max',
'unit_of_measurement': 'players',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_players_max',
'entity_id': 'sensor.mc_dummyserver_com_25566_players_max',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -44,10 +44,10 @@
# name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].3
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server World message',
'friendly_name': 'mc.dummyserver.com:25566 World message',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_world_message',
'entity_id': 'sensor.mc_dummyserver_com_25566_world_message',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -57,10 +57,10 @@
# name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].4
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Version',
'friendly_name': 'mc.dummyserver.com:25566 Version',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_version',
'entity_id': 'sensor.mc_dummyserver_com_25566_version',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -70,10 +70,10 @@
# name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].5
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Protocol version',
'friendly_name': 'mc.dummyserver.com:25566 Protocol version',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_protocol_version',
'entity_id': 'sensor.mc_dummyserver_com_25566_protocol_version',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -83,10 +83,10 @@
# name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].6
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Map name',
'friendly_name': 'mc.dummyserver.com:25566 Map name',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_map_name',
'entity_id': 'sensor.mc_dummyserver_com_25566_map_name',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -96,10 +96,10 @@
# name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].7
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Game mode',
'friendly_name': 'mc.dummyserver.com:25566 Game mode',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_game_mode',
'entity_id': 'sensor.mc_dummyserver_com_25566_game_mode',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -109,10 +109,10 @@
# name: test_sensor[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].8
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Edition',
'friendly_name': 'mc.dummyserver.com:25566 Edition',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_edition',
'entity_id': 'sensor.mc_dummyserver_com_25566_edition',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -122,11 +122,11 @@
# name: test_sensor[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Latency',
'friendly_name': 'mc.dummyserver.com:25566 Latency',
'unit_of_measurement': <UnitOfTime.MILLISECONDS: 'ms'>,
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_latency',
'entity_id': 'sensor.mc_dummyserver_com_25566_latency',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -136,7 +136,7 @@
# name: test_sensor[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].1
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Players online',
'friendly_name': 'mc.dummyserver.com:25566 Players online',
'players_list': list([
'Player 1',
'Player 2',
@ -145,7 +145,7 @@
'unit_of_measurement': 'players',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_players_online',
'entity_id': 'sensor.mc_dummyserver_com_25566_players_online',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -155,11 +155,11 @@
# name: test_sensor[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].2
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Players max',
'friendly_name': 'mc.dummyserver.com:25566 Players max',
'unit_of_measurement': 'players',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_players_max',
'entity_id': 'sensor.mc_dummyserver_com_25566_players_max',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -169,10 +169,10 @@
# name: test_sensor[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].3
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server World message',
'friendly_name': 'mc.dummyserver.com:25566 World message',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_world_message',
'entity_id': 'sensor.mc_dummyserver_com_25566_world_message',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -182,10 +182,10 @@
# name: test_sensor[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].4
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Version',
'friendly_name': 'mc.dummyserver.com:25566 Version',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_version',
'entity_id': 'sensor.mc_dummyserver_com_25566_version',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -195,10 +195,10 @@
# name: test_sensor[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].5
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Protocol version',
'friendly_name': 'mc.dummyserver.com:25566 Protocol version',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_protocol_version',
'entity_id': 'sensor.mc_dummyserver_com_25566_protocol_version',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -208,11 +208,11 @@
# name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Latency',
'friendly_name': 'mc.dummyserver.com:25566 Latency',
'unit_of_measurement': <UnitOfTime.MILLISECONDS: 'ms'>,
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_latency',
'entity_id': 'sensor.mc_dummyserver_com_25566_latency',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -222,11 +222,11 @@
# name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].1
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Players online',
'friendly_name': 'mc.dummyserver.com:25566 Players online',
'unit_of_measurement': 'players',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_players_online',
'entity_id': 'sensor.mc_dummyserver_com_25566_players_online',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -236,11 +236,11 @@
# name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].2
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Players max',
'friendly_name': 'mc.dummyserver.com:25566 Players max',
'unit_of_measurement': 'players',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_players_max',
'entity_id': 'sensor.mc_dummyserver_com_25566_players_max',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -250,10 +250,10 @@
# name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].3
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server World message',
'friendly_name': 'mc.dummyserver.com:25566 World message',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_world_message',
'entity_id': 'sensor.mc_dummyserver_com_25566_world_message',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -263,10 +263,10 @@
# name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].4
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Version',
'friendly_name': 'mc.dummyserver.com:25566 Version',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_version',
'entity_id': 'sensor.mc_dummyserver_com_25566_version',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -276,10 +276,10 @@
# name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].5
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Protocol version',
'friendly_name': 'mc.dummyserver.com:25566 Protocol version',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_protocol_version',
'entity_id': 'sensor.mc_dummyserver_com_25566_protocol_version',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -289,10 +289,10 @@
# name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].6
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Map name',
'friendly_name': 'mc.dummyserver.com:25566 Map name',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_map_name',
'entity_id': 'sensor.mc_dummyserver_com_25566_map_name',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -302,10 +302,10 @@
# name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].7
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Game mode',
'friendly_name': 'mc.dummyserver.com:25566 Game mode',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_game_mode',
'entity_id': 'sensor.mc_dummyserver_com_25566_game_mode',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -315,10 +315,10 @@
# name: test_sensor_update[bedrock_mock_config_entry-BedrockServer-lookup-status_response1-entity_ids1].8
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Edition',
'friendly_name': 'mc.dummyserver.com:25566 Edition',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_edition',
'entity_id': 'sensor.mc_dummyserver_com_25566_edition',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -328,11 +328,11 @@
# name: test_sensor_update[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Latency',
'friendly_name': 'mc.dummyserver.com:25566 Latency',
'unit_of_measurement': <UnitOfTime.MILLISECONDS: 'ms'>,
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_latency',
'entity_id': 'sensor.mc_dummyserver_com_25566_latency',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -342,7 +342,7 @@
# name: test_sensor_update[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].1
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Players online',
'friendly_name': 'mc.dummyserver.com:25566 Players online',
'players_list': list([
'Player 1',
'Player 2',
@ -351,7 +351,7 @@
'unit_of_measurement': 'players',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_players_online',
'entity_id': 'sensor.mc_dummyserver_com_25566_players_online',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -361,11 +361,11 @@
# name: test_sensor_update[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].2
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Players max',
'friendly_name': 'mc.dummyserver.com:25566 Players max',
'unit_of_measurement': 'players',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_players_max',
'entity_id': 'sensor.mc_dummyserver_com_25566_players_max',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -375,10 +375,10 @@
# name: test_sensor_update[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].3
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server World message',
'friendly_name': 'mc.dummyserver.com:25566 World message',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_world_message',
'entity_id': 'sensor.mc_dummyserver_com_25566_world_message',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -388,10 +388,10 @@
# name: test_sensor_update[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].4
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Version',
'friendly_name': 'mc.dummyserver.com:25566 Version',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_version',
'entity_id': 'sensor.mc_dummyserver_com_25566_version',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
@ -401,10 +401,10 @@
# name: test_sensor_update[java_mock_config_entry-JavaServer-async_lookup-status_response0-entity_ids0].5
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Minecraft Server Protocol version',
'friendly_name': 'mc.dummyserver.com:25566 Protocol version',
}),
'context': <ANY>,
'entity_id': 'sensor.minecraft_server_protocol_version',
'entity_id': 'sensor.mc_dummyserver_com_25566_protocol_version',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,

11
tests/components/minecraft_server/test_binary_sensor.py
View File

@ -64,7 +64,9 @@ async def test_binary_sensor(
):
assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
await hass.async_block_till_done()
assert hass.states.get("binary_sensor.minecraft_server_status") == snapshot
assert (
hass.states.get("binary_sensor.mc_dummyserver_com_25566_status") == snapshot
)
@pytest.mark.parametrize(
@ -113,7 +115,9 @@ async def test_binary_sensor_update(
freezer.tick(timedelta(minutes=1))
async_fire_time_changed(hass)
await hass.async_block_till_done()
assert hass.states.get("binary_sensor.minecraft_server_status") == snapshot
assert (
hass.states.get("binary_sensor.mc_dummyserver_com_25566_status") == snapshot
)
@pytest.mark.parametrize(
@ -167,5 +171,6 @@ async def test_binary_sensor_update_failure(
async_fire_time_changed(hass)
await hass.async_block_till_done()
assert (
hass.states.get("binary_sensor.minecraft_server_status").state == STATE_OFF
hass.states.get("binary_sensor.mc_dummyserver_com_25566_status").state
== STATE_OFF
)

8
tests/components/minecraft_server/test_config_flow.py
View File

@ -5,9 +5,9 @@ from unittest.mock import patch
from mcstatus import BedrockServer, JavaServer
from homeassistant.components.minecraft_server.api import MinecraftServerType
from homeassistant.components.minecraft_server.const import DEFAULT_NAME, DOMAIN
from homeassistant.components.minecraft_server.const import DOMAIN
from homeassistant.config_entries import SOURCE_USER
from homeassistant.const import CONF_ADDRESS, CONF_NAME, CONF_TYPE
from homeassistant.const import CONF_ADDRESS, CONF_TYPE
from homeassistant.core import HomeAssistant
from homeassistant.data_entry_flow import FlowResultType
@ -22,7 +22,6 @@ from .const import (
from tests.common import MockConfigEntry
USER_INPUT = {
CONF_NAME: DEFAULT_NAME,
CONF_ADDRESS: TEST_ADDRESS,
}
@ -146,7 +145,6 @@ async def test_java_connection(hass: HomeAssistant) -> None:
assert result["type"] is FlowResultType.CREATE_ENTRY
assert result["title"] == USER_INPUT[CONF_ADDRESS]
assert result["data"][CONF_NAME] == USER_INPUT[CONF_NAME]
assert result["data"][CONF_ADDRESS] == TEST_ADDRESS
assert result["data"][CONF_TYPE] == MinecraftServerType.JAVA_EDITION
@ -169,7 +167,6 @@ async def test_bedrock_connection(hass: HomeAssistant) -> None:
assert result["type"] is FlowResultType.CREATE_ENTRY
assert result["title"] == USER_INPUT[CONF_ADDRESS]
assert result["data"][CONF_NAME] == USER_INPUT[CONF_NAME]
assert result["data"][CONF_ADDRESS] == TEST_ADDRESS
assert result["data"][CONF_TYPE] == MinecraftServerType.BEDROCK_EDITION
@ -207,6 +204,5 @@ async def test_recovery(hass: HomeAssistant) -> None:
)
assert result2["type"] is FlowResultType.CREATE_ENTRY
assert result2["title"] == USER_INPUT[CONF_ADDRESS]
assert result2["data"][CONF_NAME] == USER_INPUT[CONF_NAME]
assert result2["data"][CONF_ADDRESS] == TEST_ADDRESS
assert result2["data"][CONF_TYPE] == MinecraftServerType.BEDROCK_EDITION

4
tests/components/minecraft_server/test_init.py
View File

@ -6,7 +6,7 @@ from mcstatus import JavaServer
import pytest
from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
from homeassistant.components.minecraft_server.const import DEFAULT_NAME, DOMAIN
from homeassistant.components.minecraft_server.const import DOMAIN
from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
from homeassistant.config_entries import ConfigEntryState
from homeassistant.const import CONF_ADDRESS, CONF_HOST, CONF_NAME, CONF_PORT
@ -23,6 +23,8 @@ from .const import (
from tests.common import MockConfigEntry
DEFAULT_NAME = "Minecraft Server"
TEST_UNIQUE_ID = f"{TEST_HOST}-{TEST_PORT}"
SENSOR_KEYS = [

40
tests/components/minecraft_server/test_sensor.py
View File

@ -22,35 +22,35 @@ from .const import (
from tests.common import async_fire_time_changed
JAVA_SENSOR_ENTITIES: list[str] = [
"sensor.minecraft_server_latency",
"sensor.minecraft_server_players_online",
"sensor.minecraft_server_players_max",
"sensor.minecraft_server_world_message",
"sensor.minecraft_server_version",
"sensor.minecraft_server_protocol_version",
"sensor.mc_dummyserver_com_25566_latency",
"sensor.mc_dummyserver_com_25566_players_online",
"sensor.mc_dummyserver_com_25566_players_max",
"sensor.mc_dummyserver_com_25566_world_message",
"sensor.mc_dummyserver_com_25566_version",
"sensor.mc_dummyserver_com_25566_protocol_version",
]
JAVA_SENSOR_ENTITIES_DISABLED_BY_DEFAULT: list[str] = [
"sensor.minecraft_server_players_max",
"sensor.minecraft_server_protocol_version",
"sensor.mc_dummyserver_com_25566_players_max",
"sensor.mc_dummyserver_com_25566_protocol_version",
]
BEDROCK_SENSOR_ENTITIES: list[str] = [
"sensor.minecraft_server_latency",
"sensor.minecraft_server_players_online",
"sensor.minecraft_server_players_max",
"sensor.minecraft_server_world_message",
"sensor.minecraft_server_version",
"sensor.minecraft_server_protocol_version",
"sensor.minecraft_server_map_name",
"sensor.minecraft_server_game_mode",
"sensor.minecraft_server_edition",
"sensor.mc_dummyserver_com_25566_latency",
"sensor.mc_dummyserver_com_25566_players_online",
"sensor.mc_dummyserver_com_25566_players_max",
"sensor.mc_dummyserver_com_25566_world_message",
"sensor.mc_dummyserver_com_25566_version",
"sensor.mc_dummyserver_com_25566_protocol_version",
"sensor.mc_dummyserver_com_25566_map_name",
"sensor.mc_dummyserver_com_25566_game_mode",
"sensor.mc_dummyserver_com_25566_edition",
]
BEDROCK_SENSOR_ENTITIES_DISABLED_BY_DEFAULT: list[str] = [
"sensor.minecraft_server_players_max",
"sensor.minecraft_server_protocol_version",
"sensor.minecraft_server_edition",
"sensor.mc_dummyserver_com_25566_players_max",
"sensor.mc_dummyserver_com_25566_protocol_version",
"sensor.mc_dummyserver_com_25566_edition",
]