Merge remote-tracking branch 'upstream/dev' into integration

tests/components/i2s_audio/test.esp32-ard.yaml

@@ -1,16 +0,0 @@
-substitutions:
-  i2s_bclk_pin: GPIO15
-  i2s_lrclk_pin: GPIO4
-  i2s_mclk_pin: GPIO5
-
-<<: !include common.yaml
-
-wifi:
-  ssid: test
-  password: test1234
-
-media_player:
-  - platform: i2s_audio
-    name: Test Media Player
-    dac_type: internal
-    mode: stereo

tests/components/media_player/common.yaml

@@ -1,18 +1,18 @@
-wifi:
-  ssid: MySSID
-  password: password1
-
 i2s_audio:
   i2s_lrclk_pin: 13
   i2s_bclk_pin: 14
   i2s_mclk_pin: 15
 
-media_player:
+speaker:
   - platform: i2s_audio
-    name: None
-    dac_type: external
+    id: test_speaker
     i2s_dout_pin: 18
-    mute_pin: 19
+    dac_type: external
+
+media_player:
+  - platform: speaker
+    name: None
+    speaker: test_speaker
     on_state:
       - media_player.play:
       - media_player.play_media: http://localhost/media.mp3