Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at devShellTools-shell 84 lines 3.8 kB view raw
1diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py 2index 5e1be36f39..df19ff1a49 100644 3--- a/homeassistant/components/ffmpeg/__init__.py 4+++ b/homeassistant/components/ffmpeg/__init__.py 5@@ -46,7 +46,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin" 6 CONF_EXTRA_ARGUMENTS = "extra_arguments" 7 CONF_OUTPUT = "output" 8 9-DEFAULT_BINARY = "ffmpeg" 10+DEFAULT_BINARY = "@ffmpeg@" 11 12 # Currently we only care if the version is < 3 13 # because we use a different content-type 14diff --git a/tests/components/ffmpeg/test_binary_sensor.py b/tests/components/ffmpeg/test_binary_sensor.py 15index 535ac86336..321eab4270 100644 16--- a/tests/components/ffmpeg/test_binary_sensor.py 17+++ b/tests/components/ffmpeg/test_binary_sensor.py 18@@ -25,7 +25,7 @@ async def test_noise_setup_component(hass: HomeAssistant) -> None: 19 await async_setup_component(hass, "binary_sensor", CONFIG_NOISE) 20 await hass.async_block_till_done() 21 22- assert hass.data["ffmpeg"].binary == "ffmpeg" 23+ assert hass.data["ffmpeg"].binary == "@ffmpeg@" 24 assert hass.states.get("binary_sensor.ffmpeg_noise") is not None 25 26 27@@ -36,7 +36,7 @@ async def test_noise_setup_component_start(mock_start, hass: HomeAssistant) -> N 28 await async_setup_component(hass, "binary_sensor", CONFIG_NOISE) 29 await hass.async_block_till_done() 30 31- assert hass.data["ffmpeg"].binary == "ffmpeg" 32+ assert hass.data["ffmpeg"].binary == "@ffmpeg@" 33 assert hass.states.get("binary_sensor.ffmpeg_noise") is not None 34 35 hass.bus.async_fire(EVENT_HOMEASSISTANT_START) 36@@ -58,7 +58,7 @@ async def test_noise_setup_component_start_callback( 37 await async_setup_component(hass, "binary_sensor", CONFIG_NOISE) 38 await hass.async_block_till_done() 39 40- assert hass.data["ffmpeg"].binary == "ffmpeg" 41+ assert hass.data["ffmpeg"].binary == "@ffmpeg@" 42 assert hass.states.get("binary_sensor.ffmpeg_noise") is not None 43 44 hass.bus.async_fire(EVENT_HOMEASSISTANT_START) 45@@ -83,7 +83,7 @@ async def test_motion_setup_component(hass: HomeAssistant) -> None: 46 await async_setup_component(hass, "binary_sensor", CONFIG_MOTION) 47 await hass.async_block_till_done() 48 49- assert hass.data["ffmpeg"].binary == "ffmpeg" 50+ assert hass.data["ffmpeg"].binary == "@ffmpeg@" 51 assert hass.states.get("binary_sensor.ffmpeg_motion") is not None 52 53 54@@ -94,7 +94,7 @@ async def test_motion_setup_component_start(mock_start, hass: HomeAssistant) -> 55 await async_setup_component(hass, "binary_sensor", CONFIG_MOTION) 56 await hass.async_block_till_done() 57 58- assert hass.data["ffmpeg"].binary == "ffmpeg" 59+ assert hass.data["ffmpeg"].binary == "@ffmpeg@" 60 assert hass.states.get("binary_sensor.ffmpeg_motion") is not None 61 62 hass.bus.async_fire(EVENT_HOMEASSISTANT_START) 63@@ -116,7 +116,7 @@ async def test_motion_setup_component_start_callback( 64 await async_setup_component(hass, "binary_sensor", CONFIG_MOTION) 65 await hass.async_block_till_done() 66 67- assert hass.data["ffmpeg"].binary == "ffmpeg" 68+ assert hass.data["ffmpeg"].binary == "@ffmpeg@" 69 assert hass.states.get("binary_sensor.ffmpeg_motion") is not None 70 71 hass.bus.async_fire(EVENT_HOMEASSISTANT_START) 72diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py 73index aa407d5b69..e6d292c040 100644 74--- a/tests/components/ffmpeg/test_init.py 75+++ b/tests/components/ffmpeg/test_init.py 76@@ -87,7 +87,7 @@ async def test_setup_component(hass: HomeAssistant) -> None: 77 with assert_setup_component(1): 78 await async_setup_component(hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}}) 79 80- assert hass.data[ffmpeg.DATA_FFMPEG].binary == "ffmpeg" 81+ assert hass.data[ffmpeg.DATA_FFMPEG].binary == "@ffmpeg@" 82 83 84 async def test_setup_component_test_service(hass: HomeAssistant) -> None: