diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-09-14 11:34:08 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-09-14 11:34:08 -0400 |
| commit | 79661fece4f48e8bc92b6699f7f68bd1bfebe9fc (patch) | |
| tree | c3756dc7b1ab690064bf33a238e5e8d62fe63846 /nova/tests | |
| parent | 7a02394009aae85f722430682f8360371121504b (diff) | |
| parent | b96d0af411163d295a96da277b7da2defce5f7f7 (diff) | |
Merge w/ trunk.
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/vmwareapi/stubs.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/tests/vmwareapi/stubs.py b/nova/tests/vmwareapi/stubs.py index 0ed5e9b68..7de10e612 100644 --- a/nova/tests/vmwareapi/stubs.py +++ b/nova/tests/vmwareapi/stubs.py @@ -47,7 +47,5 @@ def set_stubs(stubs): stubs.Set(vmware_images, 'upload_image', fake.fake_upload_image)
stubs.Set(vmwareapi_conn.VMWareAPISession, "_get_vim_object",
fake_get_vim_object)
- stubs.Set(vmwareapi_conn.VMWareAPISession, "_get_vim_object",
- fake_get_vim_object)
stubs.Set(vmwareapi_conn.VMWareAPISession, "_is_vim_object",
fake_is_vim_object)
|