tests: Merge swap label and UUID test cases

Author: vojtechtrefny

tests/swap_test.py

@@ -115,21 +115,14 @@ def test_all(self):
         on = BlockDev.swap_swapstatus(self.loop_dev)
         self.assertFalse(on)
 
-    def test_mkswap_with_label(self):
+    def test_mkswap_with_label_uuid(self):
         """Verify that mkswap with label works as expected"""
 
-        succ = BlockDev.swap_mkswap(self.loop_dev, "BlockDevSwap", None)
+        succ = BlockDev.swap_mkswap(self.loop_dev, label="BlockDevSwap", uuid=self.test_uuid)
         self.assertTrue(succ)
 
         _ret, out, _err = run_command("blkid -ovalue -sLABEL -p %s" % self.loop_dev)
         self.assertEqual(out, "BlockDevSwap")
-
-    def test_mkswap_with_uuid(self):
-        """Verify that mkswap with uuid works as expected"""
-
-        succ = BlockDev.swap_mkswap(self.loop_dev, uuid=self.test_uuid)
-        self.assertTrue(succ)
-
         _ret, out, _err = run_command("blkid -ovalue -sUUID -p %s" % self.loop_dev)
         self.assertEqual(out, self.test_uuid)