From 537bfce2bda471c92caabd388589230200891509 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 3 Jul 2026 19:53:18 +0200 Subject: New upstream version 1.58~rc1 --- .../ifcfg-Test_Write_WiFi_AP_Mode.cexpected | 3 +- .../ifcfg-Test_Write_WiFi_Band_6ghz.cexpected | 18 +++++ .../ifcfg-Test_Write_WiFi_Band_A.cexpected | 18 ----- .../ifcfg-Test_Write_WiFi_Band_a.cexpected | 18 +++++ .../network-scripts/ifcfg-test-wifi-band-6ghz | 13 +++ .../ifcfg-test-wifi-band-6ghz-channel-mismatch | 9 +++ .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 93 +++++++++++++++++++++- 7 files changed, 150 insertions(+), 22 deletions(-) create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_6ghz.cexpected delete mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_a.cexpected create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz create mode 100644 src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz-channel-mismatch (limited to 'src/core/settings/plugins/ifcfg-rh/tests') diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected index caeaaff8..8199a9b4 100644 --- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected @@ -1,6 +1,7 @@ ESSID=MySSID MODE=Ap -CHANNEL=196 +CHANNEL=52 +BAND=a MAC_ADDRESS_RANDOMIZATION=default AP_ISOLATION=yes TYPE=Wireless diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_6ghz.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_6ghz.cexpected new file mode 100644 index 00000000..d8ffe48e --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_6ghz.cexpected @@ -0,0 +1,18 @@ +ESSID="Test SSID" +MODE=Managed +BAND=6GHz +MAC_ADDRESS_RANDOMIZATION=default +TYPE=Wireless +PROXY_METHOD=none +BROWSER_ONLY=no +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=default +NAME="Test Write Wi-Fi Band 6GHz" +UUID=${UUID} +ONBOOT=yes diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected deleted file mode 100644 index 7e3d4f02..00000000 --- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected +++ /dev/null @@ -1,18 +0,0 @@ -ESSID="Test SSID" -MODE=Managed -BAND=a -MAC_ADDRESS_RANDOMIZATION=default -TYPE=Wireless -PROXY_METHOD=none -BROWSER_ONLY=no -BOOTPROTO=dhcp -DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes -IPV6_FAILURE_FATAL=no -IPV6_ADDR_GEN_MODE=default -NAME="Test Write Wi-Fi Band A" -UUID=${UUID} -ONBOOT=yes diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_a.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_a.cexpected new file mode 100644 index 00000000..90570ea3 --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_a.cexpected @@ -0,0 +1,18 @@ +ESSID="Test SSID" +MODE=Managed +BAND=a +MAC_ADDRESS_RANDOMIZATION=default +TYPE=Wireless +PROXY_METHOD=none +BROWSER_ONLY=no +BOOTPROTO=dhcp +DEFROUTE=yes +IPV4_FAILURE_FATAL=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_FAILURE_FATAL=no +IPV6_ADDR_GEN_MODE=default +NAME="Test Write Wi-Fi Band A - 5GHz" +UUID=${UUID} +ONBOOT=yes diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz new file mode 100644 index 00000000..803ca19b --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz @@ -0,0 +1,13 @@ +TYPE=Wireless +DEVICE=eth2 +HWADDR=00:16:41:11:22:33 +NM_CONTROLLED=yes +BOOTPROTO=dhcp +ESSID=blahblah +BAND=6GHz +MODE=Managed +RATE=auto +ONBOOT=yes +USERCTL=yes +PEERDNS=yes +IPV6INIT=no diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz-channel-mismatch b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz-channel-mismatch new file mode 100644 index 00000000..26fc29fe --- /dev/null +++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz-channel-mismatch @@ -0,0 +1,9 @@ +TYPE=Wireless +DEVICE=eth2 +HWADDR=00:16:41:11:22:33 +BOOTPROTO=dhcp +ESSID=blahblah +CHANNEL=14 +BAND=6GHz +MODE=Managed + diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 2f3035ef..f5f80ed8 100644 --- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -3991,7 +3991,7 @@ test_write_wifi_band_a(void) s_con = _nm_connection_new_setting(connection, NM_TYPE_SETTING_CONNECTION); g_object_set(s_con, NM_SETTING_CONNECTION_ID, - "Test Write Wi-Fi Band A", + "Test Write Wi-Fi Band A - 5GHz", NM_SETTING_CONNECTION_UUID, nm_uuid_generate_random_str_a(), NM_SETTING_CONNECTION_TYPE, @@ -4012,7 +4012,7 @@ test_write_wifi_band_a(void) _writer_new_connec_exp(connection, TEST_SCRATCH_DIR, - TEST_IFCFG_DIR "/ifcfg-Test_Write_WiFi_Band_A.cexpected", + TEST_IFCFG_DIR "/ifcfg-Test_Write_WiFi_Band_a.cexpected", &testfile); f = _svOpenFile(testfile); @@ -4024,6 +4024,77 @@ test_write_wifi_band_a(void) nmtst_assert_connection_equals(connection, TRUE, reread, FALSE); } +static void +test_read_wifi_band_6ghz(void) +{ + gs_unref_object NMConnection *connection = NULL; + NMSettingConnection *s_con; + NMSettingWireless *s_wifi; + + connection = _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-wifi-band-6ghz", + NULL, + TYPE_WIRELESS, + NULL); + + s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION); + g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con), + ==, + NM_SETTING_WIRELESS_SETTING_NAME); + + s_wifi = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_WIRELESS); + g_assert_cmpstr(nm_setting_wireless_get_band(s_wifi), ==, "6GHz"); +} + +static void +test_write_wifi_band_6ghz(void) +{ + nmtst_auto_unlinkfile char *testfile = NULL; + gs_unref_object NMConnection *connection = NULL; + gs_unref_object NMConnection *reread = NULL; + NMSettingConnection *s_con; + NMSettingWireless *s_wifi; + shvarFile *f; + gs_unref_bytes GBytes *ssid = + nmtst_gbytes_from_arr(0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44); + + connection = nm_simple_connection_new(); + + s_con = _nm_connection_new_setting(connection, NM_TYPE_SETTING_CONNECTION); + g_object_set(s_con, + NM_SETTING_CONNECTION_ID, + "Test Write Wi-Fi Band 6GHz", + NM_SETTING_CONNECTION_UUID, + nm_uuid_generate_random_str_a(), + NM_SETTING_CONNECTION_TYPE, + NM_SETTING_WIRELESS_SETTING_NAME, + NULL); + + s_wifi = _nm_connection_new_setting(connection, NM_TYPE_SETTING_WIRELESS); + g_object_set(s_wifi, + NM_SETTING_WIRELESS_SSID, + ssid, + NM_SETTING_WIRELESS_MODE, + "infrastructure", + NM_SETTING_WIRELESS_BAND, + "6GHz", + NULL); + + nmtst_assert_connection_verifies(connection); + + _writer_new_connec_exp(connection, + TEST_SCRATCH_DIR, + TEST_IFCFG_DIR "/ifcfg-Test_Write_WiFi_Band_6ghz.cexpected", + &testfile); + + f = _svOpenFile(testfile); + _svGetValue_check(f, "BAND", "6GHz"); + svCloseFile(f); + + reread = _connection_from_file(testfile, NULL, TYPE_WIRELESS, NULL); + + nmtst_assert_connection_equals(connection, TRUE, reread, FALSE); +} + static void test_write_wifi_ap_mode(void) { @@ -4055,7 +4126,7 @@ test_write_wifi_ap_mode(void) NM_SETTING_WIRELESS_BAND, "a", NM_SETTING_WIRELESS_CHANNEL, - (guint) 196, + (guint) 52, NM_SETTING_WIRELESS_AP_ISOLATION, NM_TERNARY_TRUE, NULL); @@ -4072,6 +4143,18 @@ test_write_wifi_ap_mode(void) nmtst_assert_connection_equals(connection, TRUE, reread, FALSE); } +static void +test_read_wifi_band_6ghz_channel_mismatch(void) +{ + gs_free_error GError *error = NULL; + + _connection_from_file_fail(TEST_IFCFG_DIR "/ifcfg-test-wifi-band-6ghz-channel-mismatch", + NULL, + TYPE_WIRELESS, + &error); + g_assert_error(error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION); +} + static void test_read_wifi_band_a_channel_mismatch(void) { @@ -10680,6 +10763,9 @@ main(int argc, char **argv) test_read_wifi_band_a_channel_mismatch); g_test_add_func(TPATH "wifi/read-band-bg-channel-mismatch", test_read_wifi_band_bg_channel_mismatch); + g_test_add_func(TPATH "wifi/read-band-6ghz", test_read_wifi_band_6ghz); + g_test_add_func(TPATH "wifi/read-band-6ghz-channel-mismatch", + test_read_wifi_band_6ghz_channel_mismatch); g_test_add_func(TPATH "wifi/read-hidden", test_read_wifi_hidden); nmtst_add_test_func(TPATH "wifi/read-mac-random-always", @@ -10852,6 +10938,7 @@ main(int argc, char **argv) test_write_wifi_wpa_then_wep_with_perms); g_test_add_func(TPATH "wifi/write-hidden", test_write_wifi_hidden); g_test_add_func(TPATH "wifi/write-band-a", test_write_wifi_band_a); + g_test_add_func(TPATH "wifi/write-band-6ghz", test_write_wifi_band_6ghz); g_test_add_func(TPATH "wifi/write-ap-mode", test_write_wifi_ap_mode); g_test_add_func(TPATH "s390/read-qeth-static", test_read_wired_qeth_static); -- cgit 1.3.0-6-gf8a5