Uncouple safe_mode from OTA (#6759)

tests/components/ota/common.yaml

@@ -4,11 +4,8 @@ wifi:
 
 ota:
   - platform: esphome
-    safe_mode: true
     password: "superlongpasswordthatnoonewillknow"
     port: 3286
-    reboot_timeout: 2min
-    num_attempts: 5
     on_begin:
       then:
         - logger.log: "OTA start"

tests/components/safe_mode/common.yaml

@@ -2,9 +2,9 @@ wifi:
   ssid: MySSID
   password: password1
 
-ota:
-  - platform: esphome
-    safe_mode: true
+safe_mode:
+  num_attempts: 3
+  reboot_timeout: 2min
 
 button:
   - platform: safe_mode

tests/test1.yaml

@@ -264,13 +264,14 @@ uart:
     parity: EVEN
     baud_rate: 9600
 
+safe_mode:
+  num_attempts: 3
+  reboot_timeout: 2min
+
 ota:
   - platform: esphome
-    safe_mode: true
     password: "superlongpasswordthatnoonewillknow"
     port: 3286
-    reboot_timeout: 2min
-    num_attempts: 5
     on_state_change:
       then:
         lambda: >-

tests/test2.yaml

@@ -79,11 +79,11 @@ uart:
     sequence:
       - lambda: UARTDebug::log_hex(direction, bytes, ':');
 
+safe_mode:
+
 ota:
   - platform: esphome
-    safe_mode: true
     port: 3286
-    num_attempts: 15
 
 logger:
   level: DEBUG

tests/test3.yaml

@@ -327,11 +327,13 @@ modbus:
 vbus:
   uart_id: uart_4
 
+safe_mode:
+  num_attempts: 5
+  reboot_timeout: 10min
+
 ota:
   - platform: esphome
-    safe_mode: true
     port: 3286
-    reboot_timeout: 15min
 
 logger:
   hardware_uart: UART1

tests/test4.yaml

@@ -102,9 +102,10 @@ uart:
     baud_rate: 1200
     parity: EVEN
 
+safe_mode:
+
 ota:
   - platform: esphome
-    safe_mode: true
     port: 3286
 
 logger: