From a0f0949078aac9906ee18de9171ccd561f9ce2fb Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 9 Oct 2026 06:42:00 -1000 Subject: [PATCH] [mdns] Collapse duplicate CI test variants (#20403) --- .../{common-enabled-ethernet.yaml => common-ethernet.yaml} | 1 - tests/components/mdns/{common-enabled.yaml => common.yaml} | 1 - tests/components/mdns/test-disabled.esp32-idf.yaml | 6 ------ .../components/mdns/test-enabled-ethernet.rp2040-ard.yaml | 1 - tests/components/mdns/test-enabled.esp32-idf.yaml | 1 - tests/components/mdns/test-enabled.esp8266-ard.yaml | 1 - tests/components/mdns/test-enabled.rp2040-ard.yaml | 1 - tests/components/mdns/test-ethernet.rp2040-ard.yaml | 2 ++ tests/components/mdns/test.esp32-idf.yaml | 2 ++ tests/components/mdns/test.esp8266-ard.yaml | 2 ++ tests/components/mdns/test.rp2040-ard.yaml | 2 ++ tests/components/mdns/validate-disabled.esp32-idf.yaml | 7 +++++++ 12 files changed, 15 insertions(+), 12 deletions(-) rename tests/components/mdns/{common-enabled-ethernet.yaml => common-ethernet.yaml} (95%) rename tests/components/mdns/{common-enabled.yaml => common.yaml} (92%) delete mode 100644 tests/components/mdns/test-disabled.esp32-idf.yaml delete mode 100644 tests/components/mdns/test-enabled-ethernet.rp2040-ard.yaml delete mode 100644 tests/components/mdns/test-enabled.esp32-idf.yaml delete mode 100644 tests/components/mdns/test-enabled.esp8266-ard.yaml delete mode 100644 tests/components/mdns/test-enabled.rp2040-ard.yaml create mode 100644 tests/components/mdns/test-ethernet.rp2040-ard.yaml create mode 100644 tests/components/mdns/test.esp32-idf.yaml create mode 100644 tests/components/mdns/test.esp8266-ard.yaml create mode 100644 tests/components/mdns/test.rp2040-ard.yaml create mode 100644 tests/components/mdns/validate-disabled.esp32-idf.yaml diff --git a/tests/components/mdns/common-enabled-ethernet.yaml b/tests/components/mdns/common-ethernet.yaml similarity index 95% rename from tests/components/mdns/common-enabled-ethernet.yaml rename to tests/components/mdns/common-ethernet.yaml index bfa9321d43..95a5d0edc8 100644 --- a/tests/components/mdns/common-enabled-ethernet.yaml +++ b/tests/components/mdns/common-ethernet.yaml @@ -14,7 +14,6 @@ ethernet: mac_address: "02:AA:BB:CC:DD:01" mdns: - disabled: false services: - service: _test_service protocol: _tcp diff --git a/tests/components/mdns/common-enabled.yaml b/tests/components/mdns/common.yaml similarity index 92% rename from tests/components/mdns/common-enabled.yaml rename to tests/components/mdns/common.yaml index 8b3d81cf69..8d0154fe9d 100644 --- a/tests/components/mdns/common-enabled.yaml +++ b/tests/components/mdns/common.yaml @@ -3,7 +3,6 @@ wifi: password: password1 mdns: - disabled: false services: - service: _test_service protocol: _tcp diff --git a/tests/components/mdns/test-disabled.esp32-idf.yaml b/tests/components/mdns/test-disabled.esp32-idf.yaml deleted file mode 100644 index 07c70bf248..0000000000 --- a/tests/components/mdns/test-disabled.esp32-idf.yaml +++ /dev/null @@ -1,6 +0,0 @@ -wifi: - ssid: MySSID - password: password1 - -mdns: - disabled: true diff --git a/tests/components/mdns/test-enabled-ethernet.rp2040-ard.yaml b/tests/components/mdns/test-enabled-ethernet.rp2040-ard.yaml deleted file mode 100644 index f84a0bc276..0000000000 --- a/tests/components/mdns/test-enabled-ethernet.rp2040-ard.yaml +++ /dev/null @@ -1 +0,0 @@ -<<: !include common-enabled-ethernet.yaml diff --git a/tests/components/mdns/test-enabled.esp32-idf.yaml b/tests/components/mdns/test-enabled.esp32-idf.yaml deleted file mode 100644 index 97fd63d70e..0000000000 --- a/tests/components/mdns/test-enabled.esp32-idf.yaml +++ /dev/null @@ -1 +0,0 @@ -<<: !include common-enabled.yaml diff --git a/tests/components/mdns/test-enabled.esp8266-ard.yaml b/tests/components/mdns/test-enabled.esp8266-ard.yaml deleted file mode 100644 index 97fd63d70e..0000000000 --- a/tests/components/mdns/test-enabled.esp8266-ard.yaml +++ /dev/null @@ -1 +0,0 @@ -<<: !include common-enabled.yaml diff --git a/tests/components/mdns/test-enabled.rp2040-ard.yaml b/tests/components/mdns/test-enabled.rp2040-ard.yaml deleted file mode 100644 index 97fd63d70e..0000000000 --- a/tests/components/mdns/test-enabled.rp2040-ard.yaml +++ /dev/null @@ -1 +0,0 @@ -<<: !include common-enabled.yaml diff --git a/tests/components/mdns/test-ethernet.rp2040-ard.yaml b/tests/components/mdns/test-ethernet.rp2040-ard.yaml new file mode 100644 index 0000000000..4c2dfce1e3 --- /dev/null +++ b/tests/components/mdns/test-ethernet.rp2040-ard.yaml @@ -0,0 +1,2 @@ +packages: + mdns: !include common-ethernet.yaml diff --git a/tests/components/mdns/test.esp32-idf.yaml b/tests/components/mdns/test.esp32-idf.yaml new file mode 100644 index 0000000000..c5e8cf7aea --- /dev/null +++ b/tests/components/mdns/test.esp32-idf.yaml @@ -0,0 +1,2 @@ +packages: + mdns: !include common.yaml diff --git a/tests/components/mdns/test.esp8266-ard.yaml b/tests/components/mdns/test.esp8266-ard.yaml new file mode 100644 index 0000000000..c5e8cf7aea --- /dev/null +++ b/tests/components/mdns/test.esp8266-ard.yaml @@ -0,0 +1,2 @@ +packages: + mdns: !include common.yaml diff --git a/tests/components/mdns/test.rp2040-ard.yaml b/tests/components/mdns/test.rp2040-ard.yaml new file mode 100644 index 0000000000..c5e8cf7aea --- /dev/null +++ b/tests/components/mdns/test.rp2040-ard.yaml @@ -0,0 +1,2 @@ +packages: + mdns: !include common.yaml diff --git a/tests/components/mdns/validate-disabled.esp32-idf.yaml b/tests/components/mdns/validate-disabled.esp32-idf.yaml new file mode 100644 index 0000000000..7d76bf4de9 --- /dev/null +++ b/tests/components/mdns/validate-disabled.esp32-idf.yaml @@ -0,0 +1,7 @@ +# Disabling mdns compiles no mdns code, so config validation is enough. +wifi: + ssid: MySSID + password: password1 + +mdns: + disabled: true