Merge "Rework base file checksums."

1 files changed, 6 insertions, 0 deletions

diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py
index 1df745cdb..224d7c2aa 100644
--- a/nova/tests/test_imagecache.py
+++ b/nova/tests/test_imagecache.py
@@ -284,6 +284,8 @@ class ImageCacheManagerTestCase(test.TestCase):
                     'operating system.')
         img = {'container_format': 'ami', 'id': '42'}
 
+        self.flags(checksum_base_images=True)
+
         try:
             dirname = tempfile.mkdtemp()
             fname = os.path.join(dirname, 'aaa')
@@ -318,6 +320,10 @@ class ImageCacheManagerTestCase(test.TestCase):
             res = image_cache_manager._verify_checksum(img, fname)
             self.assertEquals(res, None)
 
+            # Checksum requests for a file with no checksum now have the
+            # side effect of creating the checksum
+            self.assertTrue(os.path.exists('%s.sha1' % fname))
+
         finally:
             shutil.rmtree(dirname)