Fix pylint errors

Variable name "COUNTER" doesn't conform to '[a-z_][a-zA-Z0-9_]{0,30}$' pattern
Method name "test_set_grub_variable_throws_without_envfile" doesn't conform to '[a-z_][a-zA-Z0-9_]{2,34}$' pattern
Method name "test_contents_not_clobbered_by_setnextboot" doesn't conform to '[a-z_][a-zA-Z0-9_]{2,34}$' pattern

Signed-off-by: Kevin Lampis <[email protected]>

Author: Kevin Lampis

tests/test_bootloader.py

@@ -64,7 +64,11 @@ def test_set_grub_variable(self):
         self.assertTrue(os.path.isfile(env))
         self.assertGreater(os.path.getsize(env), 0)
 
-    def test_set_grub_variable_throws_without_envfile(self):
+    def test_set_variable_no_envfile(self):
+        """
+        Test that calling setGrubVariable() without setting an envfile first
+        will throw an exception.
+        """
         bl = Bootloader("", "", env_block=None)
 
         with self.assertRaises(AssertionError):
@@ -184,7 +188,10 @@ def test_arbitrary_contents(self):
 }
 ''')
 
-    def test_contents_not_clobbered_by_setnextboot(self):
+    def test_contents_not_clobbered(self):
+        """
+        Test that MenuEntry.contents is not clobbered by setNextBoot
+        """
 
         self.assertIsNone(self.bl.env_block)
         self.bl.env_block = self.env

xcp/bootloader.py

@@ -40,7 +40,7 @@
 
 from .compat import open_textfile
 
-COUNTER = 0
+_counter = 0
 
 class Grub2Format(Enum):
     MULTIBOOT2 = 0
@@ -127,7 +127,7 @@ def readGrub2(cls, src_file):
         entry_format = Grub2Format.MULTIBOOT2
 
         def create_label(title):
-            global COUNTER
+            global _counter
 
             if title == branding.PRODUCT_BRAND:
                 return 'xe'
@@ -142,8 +142,8 @@ def create_label(title):
                     return 'fallback-serial'
                 else:
                     return 'fallback'
-            COUNTER += 1
-            return "label%d" % COUNTER
+            _counter += 1
+            return "label%d" % _counter
 
         def parse_boot_entry(line):
             parts = line.split(None, 2)  # Split into at most 3 parts