Skip to content

Commit

Permalink
Set default for hass_config_yaml fixture to "" (home-assistant#88608)
Browse files Browse the repository at this point in the history
Set default for hass_config_yaml fixture to ""
  • Loading branch information
jbouwh authored Feb 22, 2023
1 parent 68d4cbb commit 3afc39d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions pylint/plugins/hass_enforce_type_hints.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ class ClassTypeHintMatch:
"hass_client": "ClientSessionGenerator",
"hass_client_no_auth": "ClientSessionGenerator",
"hass_config": "ConfigType",
"hass_config_yaml": "str | None",
"hass_config_yaml_files": "dict[str, str] | None",
"hass_config_yaml": "str",
"hass_config_yaml_files": "dict[str, str]",
"hass_owner_user": "MockUser",
"hass_read_only_access_token": "str",
"hass_read_only_user": "MockUser",
Expand Down
10 changes: 5 additions & 5 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -943,18 +943,18 @@ def mock_hass_config(


@pytest.fixture
def hass_config_yaml() -> str | None:
def hass_config_yaml() -> str:
"""Fixture to parametrize the content of configuration.yaml file.
To set yaml content, tests can be marked with:
@pytest.mark.parametrize("hass_config_yaml", ["..."])
Add the `mock_hass_config_yaml: None` fixture to the test.
"""
return None
return ""


@pytest.fixture
def hass_config_yaml_files(hass_config_yaml: str | None) -> dict[str, str] | None:
def hass_config_yaml_files(hass_config_yaml: str) -> dict[str, str]:
"""Fixture to parametrize multiple yaml configuration files.
To set the YAML files to patch, tests can be marked with:
Expand All @@ -963,12 +963,12 @@ def hass_config_yaml_files(hass_config_yaml: str | None) -> dict[str, str] | Non
)
Add the `mock_hass_config_yaml: None` fixture to the test.
"""
return None if hass_config_yaml is None else {YAML_CONFIG_FILE: hass_config_yaml}
return {YAML_CONFIG_FILE: hass_config_yaml}


@pytest.fixture
def mock_hass_config_yaml(
hass: HomeAssistant, hass_config_yaml_files: dict[str, str] | None
hass: HomeAssistant, hass_config_yaml_files: dict[str, str]
) -> Generator[None, None, None]:
"""Fixture to mock the content of the yaml configuration files.
Expand Down

0 comments on commit 3afc39d

Please sign in to comment.