openstack/nova
Code Issues Proposed changes

VMware: remove duplicate _fake_create_session code

Browse Source 
This patch pulls the _fake_create_session method out so it can be reused
across tests rather than duplicated it.

Change-Id: Ie3979a84568571b2f1f63e01c6c5fb6966f0333a
Closes-bug: 1312472
This commit is contained in:
Aaron Rosen
2014-04-24 23:01:31 -07:00
parent 006c831779
commit 9978daa11c
1 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nova/tests/virt/vmwareapi/test_driver_api.py
+7 -33
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),