85 lines
3.8 KiB
Diff
85 lines
3.8 KiB
Diff
|
diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py
|
||
|
|
index 5e1be36f39..df19ff1a49 100644
|
||
|
|
--- a/homeassistant/components/ffmpeg/__init__.py
|
||
|
|
+++ b/homeassistant/components/ffmpeg/__init__.py
|
||
|
|
@@ -46,7 +46,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin"
|
||
|
|
CONF_EXTRA_ARGUMENTS = "extra_arguments"
|
||
|
|
CONF_OUTPUT = "output"
|
||
|
|
|
||
|
|
-DEFAULT_BINARY = "ffmpeg"
|
||
|
|
+DEFAULT_BINARY = "@ffmpeg@"
|
||
|
|
|
||
|
|
# Currently we only care if the version is < 3
|
||
|
|
# because we use a different content-type
|
||
|
|
diff --git a/tests/components/ffmpeg/test_binary_sensor.py b/tests/components/ffmpeg/test_binary_sensor.py
|
||
|
|
index 535ac86336..321eab4270 100644
|
||
|
|
--- a/tests/components/ffmpeg/test_binary_sensor.py
|
||
|
|
+++ b/tests/components/ffmpeg/test_binary_sensor.py
|
||
|
|
@@ -25,7 +25,7 @@ async def test_noise_setup_component(hass: HomeAssistant) -> None:
|
||
|
|
await async_setup_component(hass, "binary_sensor", CONFIG_NOISE)
|
||
|
|
await hass.async_block_till_done()
|
||
|
|
|
||
|
|
- assert hass.data["ffmpeg"].binary == "ffmpeg"
|
||
|
|
+ assert hass.data["ffmpeg"].binary == "@ffmpeg@"
|
||
|
|
assert hass.states.get("binary_sensor.ffmpeg_noise") is not None
|
||
|
|
|
||
|
|
|
||
|
|
@@ -36,7 +36,7 @@ async def test_noise_setup_component_start(mock_start, hass: HomeAssistant) -> N
|
||
|
|
await async_setup_component(hass, "binary_sensor", CONFIG_NOISE)
|
||
|
|
await hass.async_block_till_done()
|
||
|
|
|
||
|
|
- assert hass.data["ffmpeg"].binary == "ffmpeg"
|
||
|
|
+ assert hass.data["ffmpeg"].binary == "@ffmpeg@"
|
||
|
|
assert hass.states.get("binary_sensor.ffmpeg_noise") is not None
|
||
|
|
|
||
|
|
hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
|
||
|
|
@@ -58,7 +58,7 @@ async def test_noise_setup_component_start_callback(
|
||
|
|
await async_setup_component(hass, "binary_sensor", CONFIG_NOISE)
|
||
|
|
await hass.async_block_till_done()
|
||
|
|
|
||
|
|
- assert hass.data["ffmpeg"].binary == "ffmpeg"
|
||
|
|
+ assert hass.data["ffmpeg"].binary == "@ffmpeg@"
|
||
|
|
assert hass.states.get("binary_sensor.ffmpeg_noise") is not None
|
||
|
|
|
||
|
|
hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
|
||
|
|
@@ -83,7 +83,7 @@ async def test_motion_setup_component(hass: HomeAssistant) -> None:
|
||
|
|
await async_setup_component(hass, "binary_sensor", CONFIG_MOTION)
|
||
|
|
await hass.async_block_till_done()
|
||
|
|
|
||
|
|
- assert hass.data["ffmpeg"].binary == "ffmpeg"
|
||
|
|
+ assert hass.data["ffmpeg"].binary == "@ffmpeg@"
|
||
|
|
assert hass.states.get("binary_sensor.ffmpeg_motion") is not None
|
||
|
|
|
||
|
|
|
||
|
|
@@ -94,7 +94,7 @@ async def test_motion_setup_component_start(mock_start, hass: HomeAssistant) ->
|
||
|
|
await async_setup_component(hass, "binary_sensor", CONFIG_MOTION)
|
||
|
|
await hass.async_block_till_done()
|
||
|
|
|
||
|
|
- assert hass.data["ffmpeg"].binary == "ffmpeg"
|
||
|
|
+ assert hass.data["ffmpeg"].binary == "@ffmpeg@"
|
||
|
|
assert hass.states.get("binary_sensor.ffmpeg_motion") is not None
|
||
|
|
|
||
|
|
hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
|
||
|
|
@@ -116,7 +116,7 @@ async def test_motion_setup_component_start_callback(
|
||
|
|
await async_setup_component(hass, "binary_sensor", CONFIG_MOTION)
|
||
|
|
await hass.async_block_till_done()
|
||
|
|
|
||
|
|
- assert hass.data["ffmpeg"].binary == "ffmpeg"
|
||
|
|
+ assert hass.data["ffmpeg"].binary == "@ffmpeg@"
|
||
|
|
assert hass.states.get("binary_sensor.ffmpeg_motion") is not None
|
||
|
|
|
||
|
|
hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
|
||
|
|
diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py
|
||
|
|
index aa407d5b69..e6d292c040 100644
|
||
|
|
--- a/tests/components/ffmpeg/test_init.py
|
||
|
|
+++ b/tests/components/ffmpeg/test_init.py
|
||
|
|
@@ -87,7 +87,7 @@ async def test_setup_component(hass: HomeAssistant) -> None:
|
||
|
|
with assert_setup_component(1):
|
||
|
|
await async_setup_component(hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}})
|
||
|
|
|
||
|
|
- assert hass.data[ffmpeg.DATA_FFMPEG].binary == "ffmpeg"
|
||
|
|
+ assert hass.data[ffmpeg.DATA_FFMPEG].binary == "@ffmpeg@"
|
||
|
|
|
||
|
|
|
||
|
|
async def test_setup_component_test_service(hass: HomeAssistant) -> None:
|