openstack/trove
Code Issues Proposed changes

Fix the mocking in test_dbaas.py

Browse Source 
couchdb and coubase were mocking operating_system.get_ip_address,
but they did not revert it back.

Updated the test to unmocking done operating_system.get_ip_address

Change-Id: I77fbd7bbfb1fdc8bcff57972e0200b970fd22b0d
Closes-Bug: #1434767
This commit is contained in:
Sushil Kumar
2015-03-21 05:11:06 +00:00
parent 7cdc493441
commit 6d800dd804
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trove/tests/unittests/guestagent/test_dbaas.py
View File

@@ -1691,6 +1691,7 @@ class CouchbaseAppTest(testtools.TestCase):
self.orig_time_sleep = time.sleep self.orig_time_sleep = time.sleep
time.sleep = Mock() time.sleep = Mock()
self.orig_service_discovery = operating_system.service_discovery self.orig_service_discovery = operating_system.service_discovery
self.orig_get_ip = operating_system.get_ip_address
operating_system.service_discovery = ( operating_system.service_discovery = (
self.fake_couchbase_service_discovery) self.fake_couchbase_service_discovery)
operating_system.get_ip_address = Mock() operating_system.get_ip_address = Mock()
@@ -1706,6 +1707,7 @@ class CouchbaseAppTest(testtools.TestCase):
super(CouchbaseAppTest, self).tearDown() super(CouchbaseAppTest, self).tearDown()
couchservice.utils.execute_with_timeout = ( couchservice.utils.execute_with_timeout = (
self.orig_utils_execute_with_timeout) self.orig_utils_execute_with_timeout)
operating_system.get_ip_address = self.orig_get_ip
operating_system.service_discovery = self.orig_service_discovery operating_system.service_discovery = self.orig_service_discovery
time.sleep = self.orig_time_sleep time.sleep = self.orig_time_sleep
InstanceServiceStatus.find_by(instance_id=self.FAKE_ID).delete() InstanceServiceStatus.find_by(instance_id=self.FAKE_ID).delete()
@@ -1792,6 +1794,7 @@ class CouchDBAppTest(testtools.TestCase):
self.orig_time_sleep = time.sleep self.orig_time_sleep = time.sleep
time.sleep = Mock() time.sleep = Mock()
self.orig_service_discovery = operating_system.service_discovery self.orig_service_discovery = operating_system.service_discovery
self.orig_get_ip = operating_system.get_ip_address
operating_system.service_discovery = ( operating_system.service_discovery = (
self.fake_couchdb_service_discovery) self.fake_couchdb_service_discovery)
operating_system.get_ip_address = Mock() operating_system.get_ip_address = Mock()
@@ -1808,6 +1811,7 @@ class CouchDBAppTest(testtools.TestCase):
super(CouchDBAppTest, self).tearDown() super(CouchDBAppTest, self).tearDown()
couchdb_service.utils.execute_with_timeout = ( couchdb_service.utils.execute_with_timeout = (
self.orig_utils_execute_with_timeout) self.orig_utils_execute_with_timeout)
operating_system.get_ip_address = self.orig_get_ip
operating_system.service_discovery = self.orig_service_discovery operating_system.service_discovery = self.orig_service_discovery
time.sleep = self.orig_time_sleep time.sleep = self.orig_time_sleep
InstanceServiceStatus.find_by(instance_id=self.FAKE_ID).delete() InstanceServiceStatus.find_by(instance_id=self.FAKE_ID).delete()