diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-21 23:42:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-21 23:42:26 +0000 |
| commit | 2865a76c25a8f8801dcfb79e1d69b050ff3e188e (patch) | |
| tree | 889e24074db0ce3dde8aea3d9039646e85f9aa89 /nova/tests | |
| parent | ec0e6e340955e94d2d5bdded2f0547ff1082e60f (diff) | |
| parent | 76844433f69a7c29ed4566ad34d7e9740feaf660 (diff) | |
Merge "Add caching for ec2 mapping ids."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/ec2/test_cinder_cloud.py | 1 | ||||
| -rw-r--r-- | nova/tests/api/ec2/test_cloud.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py index 7b66da749..93614ef82 100644 --- a/nova/tests/api/ec2/test_cinder_cloud.py +++ b/nova/tests/api/ec2/test_cinder_cloud.py @@ -88,6 +88,7 @@ def get_instances_with_cached_ips(orig_func, *args, **kwargs): class CinderCloudTestCase(test.TestCase): def setUp(self): super(CinderCloudTestCase, self).setUp() + ec2utils.reset_cache() vol_tmpdir = self.useFixture(fixtures.TempDir()).path self.flags(compute_driver='nova.virt.fake.FakeDriver', volume_api_class='nova.tests.fake_volume.API') diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index ebf0188b9..322bbb465 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -106,6 +106,7 @@ def get_instances_with_cached_ips(orig_func, *args, **kwargs): class CloudTestCase(test.TestCase): def setUp(self): super(CloudTestCase, self).setUp() + ec2utils.reset_cache() self.flags(compute_driver='nova.virt.fake.FakeDriver', volume_api_class='nova.tests.fake_volume.API') self.useFixture(fixtures.FakeLogger('boto')) |