[blivet:master 12/13] Change name to avoid redefining built-in

mulhern amulhern at redhat.com
Fri Apr 25 12:54:31 UTC 2014


The name is method-local.
---
 tests/storagetestcase.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/storagetestcase.py b/tests/storagetestcase.py
index 7673249..d4edd00 100644
--- a/tests/storagetestcase.py
+++ b/tests/storagetestcase.py
@@ -212,15 +212,15 @@ class StorageTestCase(unittest.TestCase):
             Return the DeviceAction instance.
         """
         device = kwargs.pop("device")
-        format = kwargs.pop("format")
+        fmt = kwargs.pop("format")
         devicetree = self.storage.devicetree
 
-        self.assertNotEqual(device.format, format)
+        self.assertNotEqual(device.format, fmt)
         self.assertEqual(devicetree.getDeviceByName(device.name), device)
-        action = blivet.deviceaction.ActionCreateFormat(device, format)
+        action = blivet.deviceaction.ActionCreateFormat(device, fmt)
         devicetree.registerAction(action)
         _device = devicetree.getDeviceByName(device.name)
-        self.assertEqual(_device.format, format)
+        self.assertEqual(_device.format, fmt)
         return action
 
     def scheduleDestroyFormat(self, *args, **kwargs):
-- 
1.8.3.1



More information about the anaconda-patches mailing list