Tests: Refactor bootloader-entries-crosscheck

I've made this use functions to make it easier to add support for more
bootloaders.  Seeing as there will be a big diff anyway I've also adjusted
the formatting to make it pep8 compliant.

tests/bootloader-entries-crosscheck.py

@@ -20,58 +20,59 @@
 import os
 import sys
 
-if len(sys.argv) == 1:
-    sysroot = ''
-else:
-    sysroot = sys.argv[1]
 
-bootloader = sys.argv[2]
+def main(argv):
-loaderpath = sysroot + '/boot/loader/entries'
+    _, sysroot, bootloader = argv
-syslinuxpath = sysroot + '/boot/syslinux/syslinux.cfg'
 
-if bootloader == "grub2":
+    if bootloader == "grub2":
         sys.stdout.write('GRUB2 configuration validation not implemented.\n')
-    sys.exit(0)
+        return 0
+    else:
+        return validate_syslinux(sysroot)
+
 
 def fatal(msg):
     sys.stderr.write(msg)
     sys.stderr.write('\n')
     sys.exit(1)
 
-def entry_get_version(entry):
-    return int(entry['version'])
 
 def get_ostree_option(optionstring):
     for o in optionstring.split():
         if o.startswith('ostree='):
             return o[8:]
-    raise ValueError('ostree= not found')
+    raise ValueError('ostree= not found in %r' % (optionstring,))
 
-entries = []
-syslinux_entries = []
 
-# Parse loader configs
+def parse_loader_configs(sysroot):
-for fname in os.listdir(loaderpath):
+    loaderpath = sysroot + '/boot/loader/entries'
+    entries = []
+
+    # Parse loader configs
+    for fname in os.listdir(loaderpath):
         path = os.path.join(loaderpath, fname)
-    with open(path) as f:
         entry = {}
+        with open(path) as f:
             for line in f:
                 line = line.strip()
                 if (line == '' or line.startswith('#')):
                     continue
-            s = line.find(' ')
+                k, v = line.split(' ', 1)
-            assert s > 0
-            k = line[0:s]
-            v = line[s+1:]
                 entry[k] = v
         entries.append(entry)
-    entries.sort(key=entry_get_version, reverse=True)
+    entries.sort(key=lambda e: int(e['version']), reverse=True)
+    return entries
 
-# Parse SYSLINUX config
+
-with open(syslinuxpath) as f:
+def validate_syslinux(sysroot):
-    in_ostree_config = False
+    syslinuxpath = sysroot + '/boot/syslinux/syslinux.cfg'
+
+    entries = parse_loader_configs(sysroot)
+    syslinux_entries = []
+
+    # Parse SYSLINUX config
+    with open(syslinuxpath) as f:
         syslinux_entry = None
-    syslinux_default = None
         for line in f:
             try:
                 k, v = line.strip().split(" ", 1)
@@ -94,15 +95,11 @@ with open(syslinuxpath) as f:
         if syslinux_entry is not None:
             syslinux_entries.append(syslinux_entry)
 
-if len(entries) != len(syslinux_entries):
+    if len(entries) != len(syslinux_entries):
-    fatal("Found {0} loader entries, but {1} SYSLINUX entries\n".format(len(entries), len(syslinux_entries)))
+        fatal("Found {0} loader entries, but {1} SYSLINUX entries\n".format(
+            len(entries), len(syslinux_entries)))
 
-
+    def assert_key_same_file(a, b, key):
-def assert_eq(a, b):
-    assert a == b, "%r == %r" % (a, b)
-
-
-def assert_key_same_file(a, b, key):
         aval = a[key]
         bval = b[key]
         sys.stderr.write("aval: %r\nbval: %r\n" % (aval, bval))
@@ -119,14 +116,22 @@ def assert_key_same_file(a, b, key):
         assert_eq(entry, s1)
         assert_eq(entry, s2)
 
-
+    for i, (entry, syslinuxentry) in enumerate(zip(entries, syslinux_entries)):
-for i,(entry,syslinuxentry) in enumerate(zip(entries, syslinux_entries)):
         assert_key_same_file(entry, syslinuxentry, 'linux')
         assert_key_same_file(entry, syslinuxentry, 'initrd')
         entry_ostree = get_ostree_option(entry['options'])
         syslinux_ostree = get_ostree_option(syslinuxentry['options'])
         if entry_ostree != syslinux_ostree:
-        fatal("Mismatch on ostree option: {0} != {1}".format(entry_ostree, syslinux_ostree))
+            fatal("Mismatch on ostree option: {0} != {1}".format(
+                entry_ostree, syslinux_ostree))
 
-sys.stdout.write('SYSLINUX configuration validated\n')
+    sys.stdout.write('SYSLINUX configuration validated\n')
-sys.exit(0)
+    return 0
+
+
+def assert_eq(a, b):
+    assert a == b, "%r == %r" % (a, b)
+
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))