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

2025-10-29 22:24:26 +00:00 · 2025-09-22 16:23:13 -05:00
parent 7554465287 5e94460608
commit fc55cfad0a
25 changed files with 294 additions and 35 deletions
--- a/tests/components/uart/test-uart_max_with_usb_cdc.esp32-c3-ard.yaml
+++ b/tests/components/uart/test-uart_max_with_usb_cdc.esp32-c3-ard.yaml
@@ -14,17 +14,23 @@ uart:
  - id: uart_1
    tx_pin: 4
    rx_pin: 5
+    flow_control_pin: 6
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2

  - id: uart_2
-    tx_pin: 6
-    rx_pin: 7
+    tx_pin: 7
+    rx_pin: 8
+    flow_control_pin: 9
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2
--- a/tests/components/uart/test-uart_max_with_usb_cdc.esp32-s2-ard.yaml
+++ b/tests/components/uart/test-uart_max_with_usb_cdc.esp32-s2-ard.yaml
@@ -14,17 +14,23 @@ uart:
  - id: uart_1
    tx_pin: 4
    rx_pin: 5
+    flow_control_pin: 6
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2

  - id: uart_2
-    tx_pin: 6
-    rx_pin: 7
+    tx_pin: 7
+    rx_pin: 8
+    flow_control_pin: 9
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2
--- a/tests/components/uart/test-uart_max_with_usb_cdc.esp32-s2-idf.yaml
+++ b/tests/components/uart/test-uart_max_with_usb_cdc.esp32-s2-idf.yaml
@@ -14,17 +14,23 @@ uart:
  - id: uart_1
    tx_pin: 4
    rx_pin: 5
+    flow_control_pin: 6
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2

  - id: uart_2
-    tx_pin: 6
-    rx_pin: 7
+    tx_pin: 7
+    rx_pin: 8
+    flow_control_pin: 9
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2
--- a/tests/components/uart/test-uart_max_with_usb_cdc.esp32-s3-ard.yaml
+++ b/tests/components/uart/test-uart_max_with_usb_cdc.esp32-s3-ard.yaml
@@ -14,17 +14,35 @@ uart:
  - id: uart_1
    tx_pin: 4
    rx_pin: 5
+    flow_control_pin: 6
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2

  - id: uart_2
-    tx_pin: 6
-    rx_pin: 7
+    tx_pin: 7
+    rx_pin: 8
+    flow_control_pin: 9
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
+    parity: EVEN
+    stop_bits: 2
+
+  - id: uart_3
+    tx_pin: 10
+    rx_pin: 11
+    flow_control_pin: 12
+    baud_rate: 9600
+    data_bits: 8
+    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2
--- a/tests/components/uart/test-uart_max_with_usb_serial_jtag.esp32-c3-idf.yaml
+++ b/tests/components/uart/test-uart_max_with_usb_serial_jtag.esp32-c3-idf.yaml
@@ -14,17 +14,23 @@ uart:
  - id: uart_1
    tx_pin: 4
    rx_pin: 5
+    flow_control_pin: 6
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2

  - id: uart_2
-    tx_pin: 6
-    rx_pin: 7
+    tx_pin: 7
+    rx_pin: 8
+    flow_control_pin: 9
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2
--- a/tests/components/uart/test-uart_max_with_usb_serial_jtag.esp32-s3-idf.yaml
+++ b/tests/components/uart/test-uart_max_with_usb_serial_jtag.esp32-s3-idf.yaml
@@ -14,17 +14,35 @@ uart:
  - id: uart_1
    tx_pin: 4
    rx_pin: 5
+    flow_control_pin: 6
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2

  - id: uart_2
-    tx_pin: 6
-    rx_pin: 7
+    tx_pin: 7
+    rx_pin: 8
+    flow_control_pin: 9
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
+    parity: EVEN
+    stop_bits: 2
+
+  - id: uart_3
+    tx_pin: 10
+    rx_pin: 11
+    flow_control_pin: 12
+    baud_rate: 9600
+    data_bits: 8
+    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2
--- a/tests/components/uart/test.esp32-ard.yaml
+++ b/tests/components/uart/test.esp32-ard.yaml
@@ -8,8 +8,11 @@ uart:
  - id: uart_uart
    tx_pin: 17
    rx_pin: 16
+    flow_control_pin: 4
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2
--- a/tests/components/uart/test.esp32-c3-ard.yaml
+++ b/tests/components/uart/test.esp32-c3-ard.yaml
@@ -8,8 +8,11 @@ uart:
  - id: uart_uart
    tx_pin: 4
    rx_pin: 5
+    flow_control_pin: 6
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2
--- a/tests/components/uart/test.esp32-c3-idf.yaml
+++ b/tests/components/uart/test.esp32-c3-idf.yaml
@@ -8,8 +8,11 @@ uart:
  - id: uart_uart
    tx_pin: 4
    rx_pin: 5
+    flow_control_pin: 6
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2
--- a/tests/components/uart/test.esp32-idf.yaml
+++ b/tests/components/uart/test.esp32-idf.yaml
@@ -8,9 +8,12 @@ uart:
  - id: uart_uart
    tx_pin: 17
    rx_pin: 16
+    flow_control_pin: 4
    baud_rate: 9600
    data_bits: 8
    rx_buffer_size: 512
+    rx_full_threshold: 10
+    rx_timeout: 1
    parity: EVEN
    stop_bits: 2

--- a/tests/unit_tests/fixtures/substitutions/00-simple_var.approved.yaml
+++ b/tests/unit_tests/fixtures/substitutions/00-simple_var.approved.yaml
@@ -1,7 +1,11 @@
 substitutions:
+  substituted: 99
  var1: '1'
  var2: '2'
  var21: '79'
+  value: 33
+  values: 44
+
 esphome:
  name: test
 test_list:
@@ -19,3 +23,6 @@ test_list:
  - ${ undefined_var }
  - key1: 1
    key2: 2
+  - Literal $values ${are not substituted}
+  - ["list $value", "${is not}", "${substituted}"]
+  - {"$dictionary": "$value", "${is not}": "${substituted}"}
--- a/tests/unit_tests/fixtures/substitutions/00-simple_var.input.yaml
+++ b/tests/unit_tests/fixtures/substitutions/00-simple_var.input.yaml
@@ -2,9 +2,12 @@ esphome:
  name: test

 substitutions:
+  substituted: 99
  var1: "1"
  var2: "2"
  var21: "79"
+  value: 33
+  values: 44

 test_list:
  - "$var1"
@@ -21,3 +24,6 @@ test_list:
  - ${ undefined_var }
  - key${var1}: 1
    key${var2}: 2
+  - !literal Literal $values ${are not substituted}
+  - !literal ["list $value", "${is not}", "${substituted}"]
+  - !literal {"$dictionary": "$value", "${is not}": "${substituted}"}
--- a/tests/unit_tests/fixtures/substitutions/02-expressions.approved.yaml
+++ b/tests/unit_tests/fixtures/substitutions/02-expressions.approved.yaml
@@ -22,3 +22,6 @@ test_list:
  - The pin number is 18
  - The square root is: 5.0
  - The number is 80
+  - ord("a") = 97
+  - chr(97) = a
+  - len([1,2,3]) = 3
--- a/tests/unit_tests/fixtures/substitutions/02-expressions.input.yaml
+++ b/tests/unit_tests/fixtures/substitutions/02-expressions.input.yaml
@@ -20,3 +20,6 @@ test_list:
  - The pin number is ${pin.number}
  - The square root is: ${math.sqrt(area)}
  - The number is ${var${numberOne} + 1}
+  - ord("a") = ${ ord("a") }
+  - chr(97) = ${ chr(97) }
+  - len([1,2,3]) = ${ len([1,2,3]) }