test/parser: Add variable expansion in Ubuntu conf file test

[petitboot] / test / parser / test-grub2-ubuntu-13_04-x86.c

diff --git a/test/parser/test-grub2-ubuntu-13_04-x86.c b/test/parser/test-grub2-ubuntu-13_04-x86.c
index cc4d2838a1ba0325dfdf3c0e2d07af7b9cad39d5..60f1b1099bfca2629bb8cf40cd6fd50b3ece073c 100644 (file)
--- a/test/parser/test-grub2-ubuntu-13_04-x86.c
+++ b/test/parser/test-grub2-ubuntu-13_04-x86.c
@@ -18,13 +18,13 @@ void run_test(struct parser_test *test)
        check_unresolved_resource(opt->boot_image);
        check_unresolved_resource(opt->initrd);
        check_name(opt, "Kubuntu GNU/Linux");
-       check_args(opt, "root=UUID=29beca39-9181-4780-bbb2-ab5d4be59aaf ro   quiet splash $vt_handoff");
+       check_args(opt, "root=UUID=29beca39-9181-4780-bbb2-ab5d4be59aaf ro quiet splash ");
 
        opt = get_boot_option(ctx, 1);
        check_unresolved_resource(opt->boot_image);
        check_unresolved_resource(opt->initrd);
        check_name(opt, "Kubuntu GNU/Linux, with Linux 3.8.0-19-generic");
-       check_args(opt, "root=UUID=29beca39-9181-4780-bbb2-ab5d4be59aaf ro   quiet splash $vt_handoff");
+       check_args(opt, "root=UUID=29beca39-9181-4780-bbb2-ab5d4be59aaf ro quiet splash ");
 
        opt = get_boot_option(ctx, 2);
        check_name(opt, "Kubuntu GNU/Linux, with Linux 3.8.0-19-generic (recovery mode)");
@@ -32,17 +32,19 @@ void run_test(struct parser_test *test)
 
        opt = get_boot_option(ctx, 3);
        check_unresolved_resource(opt->boot_image);
+       check_not_present_resource(opt->initrd);
        check_name(opt, "Memory test (memtest86+)");
        check_args(opt, "");
 
        opt = get_boot_option(ctx, 4);
        check_unresolved_resource(opt->boot_image);
+       check_not_present_resource(opt->initrd);
        check_name(opt, "Memory test (memtest86+, serial console 115200)");
        check_args(opt, "console=ttyS0,115200n8");
 
        /* hotplug a device with a maching UUID, and check that our
         * resources become resolved */
-       dev = test_create_device(ctx, "external");
+       dev = test_create_device(test, "external");
        dev->uuid = "29beca39-9181-4780-bbb2-ab5d4be59aaf";
        test_hotplug_device(test, dev);
 
@@ -67,8 +69,10 @@ void run_test(struct parser_test *test)
        opt = get_boot_option(ctx, 3);
        check_resolved_local_resource(opt->boot_image, dev,
                "/boot/memtest86+.bin");
+       check_not_present_resource(opt->initrd);
 
        opt = get_boot_option(ctx, 4);
        check_resolved_local_resource(opt->boot_image, dev,
                "/boot/memtest86+.bin");
+       check_not_present_resource(opt->initrd);
 }