Merge "Reset ec2 image cache between S3 tests."

nova/tests/image/test_s3.py

@@ -23,6 +23,7 @@ import tempfile
 
 import fixtures
 
+from nova.api.ec2 import ec2utils
 from nova import context
 import nova.db.api
 from nova import exception
@@ -93,6 +94,7 @@ class TestS3ImageService(test.TestCase):
 
         fake.stub_out_image_service(self.stubs)
         self.image_service = s3.S3ImageService()
+        self.addCleanup(ec2utils.reset_cache)
 
     def tearDown(self):
         super(TestS3ImageService, self).tearDown()