← Back to branch summary

~0x44/nova/extdoc

« back to all changes in this revision

Viewing changes to nova/tests/vmwareapi/stubs.py

  • Committer: Dan Prince
  • Date: 2011-09-14 15:34:08 UTC
  • mfrom: (1568 nova)
  • mto: This revision was merged to the branch mainline in revision 1570.
  • Revision ID: dan.prince@rackspace.com-20110914153408-y8iqlnz2uphraexp
Merge w/ trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/vmwareapi/stubs.py
47
47
    stubs.Set(vmware_images, 'upload_image', fake.fake_upload_image)
48
48
    stubs.Set(vmwareapi_conn.VMWareAPISession, "_get_vim_object",
49
49
              fake_get_vim_object)
50
 
    stubs.Set(vmwareapi_conn.VMWareAPISession, "_get_vim_object",
51
 
              fake_get_vim_object)
52
50
    stubs.Set(vmwareapi_conn.VMWareAPISession, "_is_vim_object",
53
51
              fake_is_vim_object)