summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorMichael Still <mikal@stillhq.com>2012-09-03 20:49:45 +1000
committerMichael Still <mikal@stillhq.com>2012-09-03 20:50:55 +1000
commit23987c19c4f10f31b3000c75a2431e170e78daa4 (patch)
tree8fe9ac0adb1b331afdd40603d830f6cab51e9ae3 /nova/tests
parentca6505ef66ecdd948325ee37b627e813cc5ad56d (diff)
Rename imagebackend arguments.
Rename function arguments to something which more clearly indicates their purpose. No functional changes. Change-Id: Iedbc5477ac54527b60c520fd7c774e608adb07c0
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/fake_imagebackend.py6
-rw-r--r--nova/tests/test_libvirt.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/tests/fake_imagebackend.py b/nova/tests/fake_imagebackend.py
index 55e59f751..b6a052f2a 100644
--- a/nova/tests/fake_imagebackend.py
+++ b/nova/tests/fake_imagebackend.py
@@ -34,11 +34,11 @@ class Backend(object):
size, *args, **kwargs):
pass
- def cache(self, fn, fname, size=None, *args, **kwargs):
+ def cache(self, fetch_func, filename, size=None, *args, **kwargs):
pass
- def libvirt_info(self, disk_bus, disk_dev,
- device_type, cache_mode):
+ def libvirt_info(self, disk_bus, disk_dev, device_type,
+ cache_mode):
info = config.LibvirtConfigGuestDisk()
info.source_type = 'file'
info.source_device = device_type
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 936a04470..e652e6d0b 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -1882,8 +1882,8 @@ class LibvirtConnTestCase(test.TestCase):
# large disk space.
self.mox.StubOutWithMock(imagebackend.Image, 'cache')
imagebackend.Image.cache(context=mox.IgnoreArg(),
- fn=mox.IgnoreArg(),
- fname='otherdisk',
+ fetch_func=mox.IgnoreArg(),
+ filename='otherdisk',
image_id=123456,
project_id='fake',
size=10737418240L,