bootloader: Add more test coverage

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>

Author: rosslagerwall

tests/data/grub-no-hypervisor.cfg

@@ -0,0 +1,10 @@
+serial --unit=0 --speed=115200
+terminal_input serial console
+terminal_output serial console
+set default=0
+set timeout=5
+menuentry 'XCP-ng' {
+	search --label --set root root-vgdorj
+	xen_module /boot/vmlinuz-4.19-xen root=LABEL=root-vgdorj ro nolvm hpet=disable console=hvc0 console=tty0 quiet vga=785 splash plymouth.ignore-serial-consoles
+	xen_module /boot/initrd-4.19-xen.img
+}

tests/data/grub-xen-boot.cfg

@@ -0,0 +1,35 @@
+serial --unit=0 --speed=115200
+terminal_input serial console
+terminal_output serial console
+set default=0
+set timeout=5
+menuentry 'XCP-ng' {
+	search --label --set root root-vgdorj
+	xen_hypervisor /boot/xen.gz dom0_mem=7584M,max:7584M watchdog ucode=scan dom0_max_vcpus=1-16 crashkernel=256M,below=4G console=vga vga=mode-0x0311
+	xen_module /boot/vmlinuz-4.19-xen root=LABEL=root-vgdorj ro nolvm hpet=disable console=hvc0 console=tty0 quiet vga=785 splash plymouth.ignore-serial-consoles
+	xen_module /boot/initrd-4.19-xen.img
+}
+menuentry 'XCP-ng (Serial)' {
+	search --label --set root root-vgdorj
+	xen_hypervisor /boot/xen.gz com1=115200,8n1 console=com1,vga dom0_mem=7584M,max:7584M watchdog ucode=scan dom0_max_vcpus=1-16 crashkernel=256M,below=4G
+	xen_module /boot/vmlinuz-4.19-xen root=LABEL=root-vgdorj ro nolvm hpet=disable console=tty0 console=hvc0
+	xen_module /boot/initrd-4.19-xen.img
+}
+menuentry 'XCP-ng in Safe Mode' {
+	search --label --set root root-vgdorj
+	xen_hypervisor /boot/xen.gz nosmp noreboot noirqbalance no-mce no-bootscrub no-numa no-hap no-mmcfg max_cstate=0 nmi=ignore allow_unsafe dom0_mem=7584M,max:7584M com1=115200,8n1 console=com1,vga
+	xen_module /boot/vmlinuz-4.19-xen earlyprintk=xen root=LABEL=root-vgdorj ro nolvm hpet=disable console=tty0 console=hvc0
+	xen_module /boot/initrd-4.19-xen.img
+}
+menuentry 'XCP-ng (Xen 4.13.1 / Linux 4.19.0+1)' {
+	search --label --set root root-vgdorj
+	xen_hypervisor /boot/xen-fallback.gz dom0_mem=7584M,max:7584M watchdog ucode=scan dom0_max_vcpus=1-16 crashkernel=256M,below=4G
+	xen_module /boot/vmlinuz-fallback root=LABEL=root-vgdorj ro nolvm hpet=disable console=hvc0 console=tty0
+	xen_module /boot/initrd-fallback.img
+}
+menuentry 'XCP-ng (Serial, Xen 4.13.1 / Linux 4.19.0+1)' {
+	search --label --set root root-vgdorj
+	xen_hypervisor /boot/xen-fallback.gz com1=115200,8n1 console=com1,vga dom0_mem=7584M,max:7584M watchdog ucode=scan dom0_max_vcpus=1-16 crashkernel=256M,below=4G
+	xen_module /boot/vmlinuz-fallback root=LABEL=root-vgdorj ro nolvm hpet=disable console=tty0 console=hvc0
+	xen_module /boot/initrd-fallback.img
+}

tests/test_bootloader.py

@@ -9,12 +9,12 @@
 
 
 class TestBootloader(unittest.TestCase):
-    def test_grub2(self):
-        bl = Bootloader.readGrub2("tests/data/grub.cfg")
+    def _test_cfg(self, cfg):
+        bl = Bootloader.readGrub2(cfg)
         with NamedTemporaryFile("w") as temp:
             bl.writeGrub2(temp.name)
             # get a diff
-            proc = subprocess.Popen(["diff", "tests/data/grub.cfg", temp.name],
+            proc = subprocess.Popen(["diff", cfg, temp.name],
                                     stdout = subprocess.PIPE,
                                     universal_newlines=True)
 
@@ -32,11 +32,24 @@ def test_grub2(self):
             proc.wait()
             self.assertEqual(proc.returncode, 1)
 
+    def test_grub2(self):
+        '''Test read/write roundtrip of GRUB2 multiboot config'''
+        self._test_cfg("tests/data/grub.cfg")
+
+    def test_grub2_xen_boot(self):
+        '''Test read/write roundtrip of GRUB2 xen_boot config'''
+        self._test_cfg("tests/data/grub-xen-boot.cfg")
+
     def test_no_multiboot(self):
         # A module2 line without a multiboot2 line is an error
         with self.assertRaises(RuntimeError):
             Bootloader.readGrub2("tests/data/grub-no-multiboot.cfg")
 
+    def test_no_hypervisor(self):
+        # A xen_module line without a xen_hypervisor line is an error
+        with self.assertRaises(RuntimeError):
+            Bootloader.readGrub2("tests/data/grub-no-hypervisor.cfg")
+
 
 class TestMenuEntry(unittest.TestCase):
     def setUp(self):