From 60d065f83b311fb30c0eee3066ca2fdd48da56e9 Mon Sep 17 00:00:00 2001 From: Bonne Eggleston Date: Mon, 20 Jan 2025 22:16:37 -0800 Subject: [PATCH] Fix up component tests by adding rx_full_threshold for esp32s Also narrow the requirement to just esp32 platforms, since that's all that's implemented right now --- esphome/components/modbus/__init__.py | 4 +++- tests/components/growatt_solar/test.esp32-ard.yaml | 1 + tests/components/growatt_solar/test.esp32-c3-ard.yaml | 1 + tests/components/growatt_solar/test.esp32-c3-idf.yaml | 1 + tests/components/growatt_solar/test.esp32-idf.yaml | 1 + tests/components/havells_solar/test.esp32-ard.yaml | 1 + tests/components/havells_solar/test.esp32-c3-ard.yaml | 1 + tests/components/havells_solar/test.esp32-c3-idf.yaml | 1 + tests/components/havells_solar/test.esp32-idf.yaml | 1 + tests/components/kuntze/test.esp32-ard.yaml | 1 + tests/components/kuntze/test.esp32-c3-ard.yaml | 1 + tests/components/kuntze/test.esp32-c3-idf.yaml | 1 + tests/components/kuntze/test.esp32-idf.yaml | 1 + tests/components/modbus/test.esp32-ard.yaml | 1 + tests/components/modbus/test.esp32-c3-ard.yaml | 1 + tests/components/modbus/test.esp32-c3-idf.yaml | 1 + tests/components/modbus/test.esp32-idf.yaml | 1 + tests/components/modbus_controller/test.esp32-ard.yaml | 2 ++ tests/components/modbus_controller/test.esp32-c3-ard.yaml | 1 + tests/components/modbus_controller/test.esp32-c3-idf.yaml | 1 + tests/components/modbus_controller/test.esp32-idf.yaml | 1 + tests/components/pzemac/test.esp32-ard.yaml | 1 + tests/components/pzemac/test.esp32-c3-ard.yaml | 1 + tests/components/pzemac/test.esp32-c3-idf.yaml | 1 + tests/components/pzemac/test.esp32-idf.yaml | 1 + tests/components/pzemdc/test.esp32-ard.yaml | 1 + tests/components/pzemdc/test.esp32-c3-ard.yaml | 1 + tests/components/pzemdc/test.esp32-c3-idf.yaml | 1 + tests/components/pzemdc/test.esp32-idf.yaml | 1 + tests/components/sdm_meter/test.esp32-ard.yaml | 1 + tests/components/sdm_meter/test.esp32-c3-ard.yaml | 1 + tests/components/sdm_meter/test.esp32-c3-idf.yaml | 1 + tests/components/sdm_meter/test.esp32-idf.yaml | 1 + tests/components/selec_meter/test.esp32-ard.yaml | 1 + tests/components/selec_meter/test.esp32-c3-ard.yaml | 1 + tests/components/selec_meter/test.esp32-c3-idf.yaml | 1 + tests/components/selec_meter/test.esp32-idf.yaml | 1 + 37 files changed, 40 insertions(+), 1 deletion(-) diff --git a/esphome/components/modbus/__init__.py b/esphome/components/modbus/__init__.py index 0846f6e869..f05c92e263 100644 --- a/esphome/components/modbus/__init__.py +++ b/esphome/components/modbus/__init__.py @@ -12,6 +12,7 @@ from esphome.const import ( CONF_ADDRESS, CONF_DISABLE_CRC, ) +from esphome.core import CORE from esphome import pins DEPENDENCIES = ["uart"] @@ -53,7 +54,8 @@ CONFIG_SCHEMA = ( def validate_rx_full_threshold_uart(config): - uart.final_validate_device_schema("modbus", rx_full_threshold=1)(config) + if CORE.is_esp32: + uart.final_validate_device_schema("modbus", rx_full_threshold=1)(config) FINAL_VALIDATE_SCHEMA = validate_rx_full_threshold_uart diff --git a/tests/components/growatt_solar/test.esp32-ard.yaml b/tests/components/growatt_solar/test.esp32-ard.yaml index 654f2ccedf..20ca404dd1 100644 --- a/tests/components/growatt_solar/test.esp32-ard.yaml +++ b/tests/components/growatt_solar/test.esp32-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 modbus: flow_control_pin: 13 diff --git a/tests/components/growatt_solar/test.esp32-c3-ard.yaml b/tests/components/growatt_solar/test.esp32-c3-ard.yaml index 7e73897856..cc1ef1939c 100644 --- a/tests/components/growatt_solar/test.esp32-c3-ard.yaml +++ b/tests/components/growatt_solar/test.esp32-c3-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 modbus: flow_control_pin: 3 diff --git a/tests/components/growatt_solar/test.esp32-c3-idf.yaml b/tests/components/growatt_solar/test.esp32-c3-idf.yaml index 7e73897856..cc1ef1939c 100644 --- a/tests/components/growatt_solar/test.esp32-c3-idf.yaml +++ b/tests/components/growatt_solar/test.esp32-c3-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 modbus: flow_control_pin: 3 diff --git a/tests/components/growatt_solar/test.esp32-idf.yaml b/tests/components/growatt_solar/test.esp32-idf.yaml index 654f2ccedf..20ca404dd1 100644 --- a/tests/components/growatt_solar/test.esp32-idf.yaml +++ b/tests/components/growatt_solar/test.esp32-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 modbus: flow_control_pin: 13 diff --git a/tests/components/havells_solar/test.esp32-ard.yaml b/tests/components/havells_solar/test.esp32-ard.yaml index 2cda8e37be..eb23a33ce4 100644 --- a/tests/components/havells_solar/test.esp32-ard.yaml +++ b/tests/components/havells_solar/test.esp32-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 modbus: flow_control_pin: 3 diff --git a/tests/components/havells_solar/test.esp32-c3-ard.yaml b/tests/components/havells_solar/test.esp32-c3-ard.yaml index 5cb911cf71..a1b5eb801d 100644 --- a/tests/components/havells_solar/test.esp32-c3-ard.yaml +++ b/tests/components/havells_solar/test.esp32-c3-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 modbus: flow_control_pin: 3 diff --git a/tests/components/havells_solar/test.esp32-c3-idf.yaml b/tests/components/havells_solar/test.esp32-c3-idf.yaml index 5cb911cf71..a1b5eb801d 100644 --- a/tests/components/havells_solar/test.esp32-c3-idf.yaml +++ b/tests/components/havells_solar/test.esp32-c3-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 modbus: flow_control_pin: 3 diff --git a/tests/components/havells_solar/test.esp32-idf.yaml b/tests/components/havells_solar/test.esp32-idf.yaml index 2cda8e37be..eb23a33ce4 100644 --- a/tests/components/havells_solar/test.esp32-idf.yaml +++ b/tests/components/havells_solar/test.esp32-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 modbus: flow_control_pin: 3 diff --git a/tests/components/kuntze/test.esp32-ard.yaml b/tests/components/kuntze/test.esp32-ard.yaml index 6b6c638971..cb0fee7292 100644 --- a/tests/components/kuntze/test.esp32-ard.yaml +++ b/tests/components/kuntze/test.esp32-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 modbus: flow_control_pin: 13 diff --git a/tests/components/kuntze/test.esp32-c3-ard.yaml b/tests/components/kuntze/test.esp32-c3-ard.yaml index 08278c3c82..a4cdc71b29 100644 --- a/tests/components/kuntze/test.esp32-c3-ard.yaml +++ b/tests/components/kuntze/test.esp32-c3-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 modbus: flow_control_pin: 3 diff --git a/tests/components/kuntze/test.esp32-c3-idf.yaml b/tests/components/kuntze/test.esp32-c3-idf.yaml index 08278c3c82..a4cdc71b29 100644 --- a/tests/components/kuntze/test.esp32-c3-idf.yaml +++ b/tests/components/kuntze/test.esp32-c3-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 modbus: flow_control_pin: 3 diff --git a/tests/components/kuntze/test.esp32-idf.yaml b/tests/components/kuntze/test.esp32-idf.yaml index 6b6c638971..cb0fee7292 100644 --- a/tests/components/kuntze/test.esp32-idf.yaml +++ b/tests/components/kuntze/test.esp32-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 modbus: flow_control_pin: 13 diff --git a/tests/components/modbus/test.esp32-ard.yaml b/tests/components/modbus/test.esp32-ard.yaml index 20cf238b1b..7efbb9a3ed 100644 --- a/tests/components/modbus/test.esp32-ard.yaml +++ b/tests/components/modbus/test.esp32-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 modbus: id: mod_bus1 diff --git a/tests/components/modbus/test.esp32-c3-ard.yaml b/tests/components/modbus/test.esp32-c3-ard.yaml index d22b507be0..6aa9256397 100644 --- a/tests/components/modbus/test.esp32-c3-ard.yaml +++ b/tests/components/modbus/test.esp32-c3-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 modbus: id: mod_bus1 diff --git a/tests/components/modbus/test.esp32-c3-idf.yaml b/tests/components/modbus/test.esp32-c3-idf.yaml index d22b507be0..6aa9256397 100644 --- a/tests/components/modbus/test.esp32-c3-idf.yaml +++ b/tests/components/modbus/test.esp32-c3-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 modbus: id: mod_bus1 diff --git a/tests/components/modbus/test.esp32-idf.yaml b/tests/components/modbus/test.esp32-idf.yaml index 20cf238b1b..7efbb9a3ed 100644 --- a/tests/components/modbus/test.esp32-idf.yaml +++ b/tests/components/modbus/test.esp32-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 modbus: id: mod_bus1 diff --git a/tests/components/modbus_controller/test.esp32-ard.yaml b/tests/components/modbus_controller/test.esp32-ard.yaml index f5c5c10125..5e4203dc81 100644 --- a/tests/components/modbus_controller/test.esp32-ard.yaml +++ b/tests/components/modbus_controller/test.esp32-ard.yaml @@ -3,10 +3,12 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 - id: uart_modbus_server tx_pin: 1 rx_pin: 3 baud_rate: 9600 + rx_full_threshold: 1 modbus: - id: mod_bus1 diff --git a/tests/components/modbus_controller/test.esp32-c3-ard.yaml b/tests/components/modbus_controller/test.esp32-c3-ard.yaml index 476e65ecb0..2ea54dad35 100644 --- a/tests/components/modbus_controller/test.esp32-c3-ard.yaml +++ b/tests/components/modbus_controller/test.esp32-c3-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 modbus: id: mod_bus1 diff --git a/tests/components/modbus_controller/test.esp32-c3-idf.yaml b/tests/components/modbus_controller/test.esp32-c3-idf.yaml index 476e65ecb0..2ea54dad35 100644 --- a/tests/components/modbus_controller/test.esp32-c3-idf.yaml +++ b/tests/components/modbus_controller/test.esp32-c3-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 modbus: id: mod_bus1 diff --git a/tests/components/modbus_controller/test.esp32-idf.yaml b/tests/components/modbus_controller/test.esp32-idf.yaml index 0e1849dd88..dc600b23f2 100644 --- a/tests/components/modbus_controller/test.esp32-idf.yaml +++ b/tests/components/modbus_controller/test.esp32-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 modbus: id: mod_bus1 diff --git a/tests/components/pzemac/test.esp32-ard.yaml b/tests/components/pzemac/test.esp32-ard.yaml index ce431a6100..955b62f245 100644 --- a/tests/components/pzemac/test.esp32-ard.yaml +++ b/tests/components/pzemac/test.esp32-ard.yaml @@ -8,6 +8,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 modbus: diff --git a/tests/components/pzemac/test.esp32-c3-ard.yaml b/tests/components/pzemac/test.esp32-c3-ard.yaml index 6d9abbebe9..d57c6a15b6 100644 --- a/tests/components/pzemac/test.esp32-c3-ard.yaml +++ b/tests/components/pzemac/test.esp32-c3-ard.yaml @@ -8,6 +8,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 modbus: diff --git a/tests/components/pzemac/test.esp32-c3-idf.yaml b/tests/components/pzemac/test.esp32-c3-idf.yaml index 6d9abbebe9..d57c6a15b6 100644 --- a/tests/components/pzemac/test.esp32-c3-idf.yaml +++ b/tests/components/pzemac/test.esp32-c3-idf.yaml @@ -8,6 +8,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 modbus: diff --git a/tests/components/pzemac/test.esp32-idf.yaml b/tests/components/pzemac/test.esp32-idf.yaml index ce431a6100..955b62f245 100644 --- a/tests/components/pzemac/test.esp32-idf.yaml +++ b/tests/components/pzemac/test.esp32-idf.yaml @@ -8,6 +8,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 modbus: diff --git a/tests/components/pzemdc/test.esp32-ard.yaml b/tests/components/pzemdc/test.esp32-ard.yaml index 9cc61137de..b4ef57aae3 100644 --- a/tests/components/pzemdc/test.esp32-ard.yaml +++ b/tests/components/pzemdc/test.esp32-ard.yaml @@ -9,6 +9,7 @@ uart: rx_pin: 16 baud_rate: 9600 stop_bits: 2 + rx_full_threshold: 1 sensor: - platform: pzemdc diff --git a/tests/components/pzemdc/test.esp32-c3-ard.yaml b/tests/components/pzemdc/test.esp32-c3-ard.yaml index 02114b781d..c66f4c2199 100644 --- a/tests/components/pzemdc/test.esp32-c3-ard.yaml +++ b/tests/components/pzemdc/test.esp32-c3-ard.yaml @@ -9,6 +9,7 @@ uart: rx_pin: 5 baud_rate: 9600 stop_bits: 2 + rx_full_threshold: 1 sensor: - platform: pzemdc diff --git a/tests/components/pzemdc/test.esp32-c3-idf.yaml b/tests/components/pzemdc/test.esp32-c3-idf.yaml index 02114b781d..c66f4c2199 100644 --- a/tests/components/pzemdc/test.esp32-c3-idf.yaml +++ b/tests/components/pzemdc/test.esp32-c3-idf.yaml @@ -9,6 +9,7 @@ uart: rx_pin: 5 baud_rate: 9600 stop_bits: 2 + rx_full_threshold: 1 sensor: - platform: pzemdc diff --git a/tests/components/pzemdc/test.esp32-idf.yaml b/tests/components/pzemdc/test.esp32-idf.yaml index 9cc61137de..b4ef57aae3 100644 --- a/tests/components/pzemdc/test.esp32-idf.yaml +++ b/tests/components/pzemdc/test.esp32-idf.yaml @@ -9,6 +9,7 @@ uart: rx_pin: 16 baud_rate: 9600 stop_bits: 2 + rx_full_threshold: 1 sensor: - platform: pzemdc diff --git a/tests/components/sdm_meter/test.esp32-ard.yaml b/tests/components/sdm_meter/test.esp32-ard.yaml index eb3958db19..d64c8f9bf7 100644 --- a/tests/components/sdm_meter/test.esp32-ard.yaml +++ b/tests/components/sdm_meter/test.esp32-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 sensor: - platform: sdm_meter diff --git a/tests/components/sdm_meter/test.esp32-c3-ard.yaml b/tests/components/sdm_meter/test.esp32-c3-ard.yaml index 0c2144f983..7e4e113393 100644 --- a/tests/components/sdm_meter/test.esp32-c3-ard.yaml +++ b/tests/components/sdm_meter/test.esp32-c3-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 sensor: - platform: sdm_meter diff --git a/tests/components/sdm_meter/test.esp32-c3-idf.yaml b/tests/components/sdm_meter/test.esp32-c3-idf.yaml index 0c2144f983..7e4e113393 100644 --- a/tests/components/sdm_meter/test.esp32-c3-idf.yaml +++ b/tests/components/sdm_meter/test.esp32-c3-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 sensor: - platform: sdm_meter diff --git a/tests/components/sdm_meter/test.esp32-idf.yaml b/tests/components/sdm_meter/test.esp32-idf.yaml index eb3958db19..d64c8f9bf7 100644 --- a/tests/components/sdm_meter/test.esp32-idf.yaml +++ b/tests/components/sdm_meter/test.esp32-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 sensor: - platform: sdm_meter diff --git a/tests/components/selec_meter/test.esp32-ard.yaml b/tests/components/selec_meter/test.esp32-ard.yaml index 648adc1757..5a86da3eac 100644 --- a/tests/components/selec_meter/test.esp32-ard.yaml +++ b/tests/components/selec_meter/test.esp32-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 sensor: - platform: selec_meter diff --git a/tests/components/selec_meter/test.esp32-c3-ard.yaml b/tests/components/selec_meter/test.esp32-c3-ard.yaml index 5f6e69f96f..915afda107 100644 --- a/tests/components/selec_meter/test.esp32-c3-ard.yaml +++ b/tests/components/selec_meter/test.esp32-c3-ard.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 sensor: - platform: selec_meter diff --git a/tests/components/selec_meter/test.esp32-c3-idf.yaml b/tests/components/selec_meter/test.esp32-c3-idf.yaml index 5f6e69f96f..915afda107 100644 --- a/tests/components/selec_meter/test.esp32-c3-idf.yaml +++ b/tests/components/selec_meter/test.esp32-c3-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 4 rx_pin: 5 baud_rate: 9600 + rx_full_threshold: 1 sensor: - platform: selec_meter diff --git a/tests/components/selec_meter/test.esp32-idf.yaml b/tests/components/selec_meter/test.esp32-idf.yaml index 648adc1757..5a86da3eac 100644 --- a/tests/components/selec_meter/test.esp32-idf.yaml +++ b/tests/components/selec_meter/test.esp32-idf.yaml @@ -3,6 +3,7 @@ uart: tx_pin: 17 rx_pin: 16 baud_rate: 9600 + rx_full_threshold: 1 sensor: - platform: selec_meter