Merge "Rework base file checksums."
This commit is contained in:
		@@ -284,6 +284,8 @@ class ImageCacheManagerTestCase(test.TestCase):
 | 
				
			|||||||
                    'operating system.')
 | 
					                    'operating system.')
 | 
				
			||||||
        img = {'container_format': 'ami', 'id': '42'}
 | 
					        img = {'container_format': 'ami', 'id': '42'}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        self.flags(checksum_base_images=True)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
            dirname = tempfile.mkdtemp()
 | 
					            dirname = tempfile.mkdtemp()
 | 
				
			||||||
            fname = os.path.join(dirname, 'aaa')
 | 
					            fname = os.path.join(dirname, 'aaa')
 | 
				
			||||||
@@ -318,6 +320,10 @@ class ImageCacheManagerTestCase(test.TestCase):
 | 
				
			|||||||
            res = image_cache_manager._verify_checksum(img, fname)
 | 
					            res = image_cache_manager._verify_checksum(img, fname)
 | 
				
			||||||
            self.assertEquals(res, None)
 | 
					            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:
 | 
					        finally:
 | 
				
			||||||
            shutil.rmtree(dirname)
 | 
					            shutil.rmtree(dirname)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user