openstack/deb-nova
Code Issues Proposed changes

Merge "VMware: remove duplicate _fake_create_session code"

Browse Source
This commit is contained in:
Jenkins
2014-04-29 23:40:07 +00:00
committed by Gerrit Code Review
parent 2acd7fbe85 9978daa11c
commit 459e89cf5c
1 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
nova/tests/virt/vmwareapi/test_driver_api.py
View File

@@ -110,6 +110,13 @@ class VMwareSudsTest(test.NoDBTestCase):
copy.deepcopy, self.vim)
def _fake_create_session(inst):
session = vmwareapi_fake.DataObject()
session.key = 'fake_key'
session.userName = 'fake_username'
inst._session = session
class VMwareSessionTestCase(test.NoDBTestCase):
def _fake_is_vim_object(self, module):
@@ -118,12 +125,6 @@ class VMwareSessionTestCase(test.NoDBTestCase):
@mock.patch('time.sleep')
def test_call_method_vim_fault(self, mock_sleep):
def _fake_create_session(self):
session = vmwareapi_fake.DataObject()
session.key = 'fake_key'
session.userName = 'fake_username'
self._session = session
def _fake_session_is_active(self):
return False
@@ -145,12 +146,6 @@ class VMwareSessionTestCase(test.NoDBTestCase):
def test_call_method_vim_empty(self):
def _fake_create_session(self):
session = vmwareapi_fake.DataObject()
session.key = 'fake_key'
session.userName = 'fake_username'
self._session = session
def _fake_session_is_active(self):
return True
@@ -171,13 +166,6 @@ class VMwareSessionTestCase(test.NoDBTestCase):
@mock.patch('time.sleep')
def test_call_method_session_exception(self, mock_sleep):
def _fake_create_session(self):
session = vmwareapi_fake.DataObject()
session.key = 'fake_key'
session.userName = 'fake_username'
self._session = session
with contextlib.nested(
mock.patch.object(driver.VMwareAPISession, '_is_vim_object',
self._fake_is_vim_object),
@@ -193,13 +181,6 @@ class VMwareSessionTestCase(test.NoDBTestCase):
*args, **kwargs)
def test_call_method_session_file_exists_exception(self):
def _fake_create_session(self):
session = vmwareapi_fake.DataObject()
session.key = 'fake_key'
session.userName = 'fake_username'
self._session = session
with contextlib.nested(
mock.patch.object(driver.VMwareAPISession, '_is_vim_object',
self._fake_is_vim_object),
@@ -215,13 +196,6 @@ class VMwareSessionTestCase(test.NoDBTestCase):
*args, **kwargs)
def test_call_method_session_no_permission_exception(self):
def _fake_create_session(self):
session = vmwareapi_fake.DataObject()
session.key = 'fake_key'
session.userName = 'fake_username'
self._session = session
with contextlib.nested(
mock.patch.object(driver.VMwareAPISession, '_is_vim_object',
self._fake_is_vim_object),