summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-11-11 11:25:58 +0100
committerLubomir Rintel <lkundrak@v3.sk>2019-11-18 13:40:48 +0100
commitcdfa3d342811f271597fa18ecc458bebf60a7989 (patch)
tree99106ed32fe0f58bbb66c7ab5c41d5532c4e8d60
parent45548bc670be672b18ef9b2ae047f09b21a6d126 (diff)
downloadNetworkManager-cdfa3d342811f271597fa18ecc458bebf60a7989.tar.gz
initrd/tests: put the bootif=no next to the other bootif testslr/initrd-fixes
A cosmetical improvement.
-rw-r--r--src/initrd/tests/test-cmdline-reader.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
index 52183ae77a..1d4bb9a6e8 100644
--- a/src/initrd/tests/test-cmdline-reader.c
+++ b/src/initrd/tests/test-cmdline-reader.c
@@ -421,17 +421,6 @@ test_some_more (void)
}
static void
-test_no_bootif (void)
-{
- gs_unref_hashtable GHashTable *connections = NULL;
- const char *const*ARGV = NM_MAKE_STRV ("BOOTIF=01-00-53-AB-cd-02-03", "rd.bootif=0");
-
- connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
- g_assert (connections);
- g_assert_cmpint (g_hash_table_size (connections), ==, 0);
-}
-
-static void
test_bond (void)
{
gs_unref_hashtable GHashTable *connections = NULL;
@@ -1025,6 +1014,17 @@ test_bootif_hwtype (void)
g_assert (nm_setting_ip_config_get_may_fail (s_ip6));
}
+static void
+test_bootif_off (void)
+{
+ gs_unref_hashtable GHashTable *connections = NULL;
+ const char *const*ARGV = NM_MAKE_STRV ("BOOTIF=01-00-53-AB-cd-02-03", "rd.bootif=0");
+
+ connections = nmi_cmdline_reader_parse (TEST_INITRD_DIR "/sysfs", ARGV);
+ g_assert (connections);
+ g_assert_cmpint (g_hash_table_size (connections), ==, 0);
+}
+
NMTST_DEFINE ();
int main (int argc, char **argv)
@@ -1040,7 +1040,6 @@ int main (int argc, char **argv)
g_test_add_func ("/initrd/cmdline/multiple", test_multiple);
g_test_add_func ("/initrd/cmdline/some_more", test_some_more);
g_test_add_func ("/initrd/cmdline/bootdev", test_bootdev);
- g_test_add_func ("/initrd/cmdline/no_bootif", test_no_bootif);
g_test_add_func ("/initrd/cmdline/bond", test_bond);
g_test_add_func ("/initrd/cmdline/bond/default", test_bond_default);
g_test_add_func ("/initrd/cmdline/team", test_team);
@@ -1052,6 +1051,7 @@ int main (int argc, char **argv)
g_test_add_func ("/initrd/cmdline/rd_znet/legacy", test_rd_znet_legacy);
g_test_add_func ("/initrd/cmdline/bootif", test_bootif);
g_test_add_func ("/initrd/cmdline/bootif/hwtype", test_bootif_hwtype);
+ g_test_add_func ("/initrd/cmdline/bootif/off", test_bootif_off);
return g_test_run ();
}