From 2239a2d288348d20a6cc6c25aefb6a92ad3260a8 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Wed, 4 Apr 2012 12:36:42 -0400 Subject: [PATCH] Fix traceback in image cache manager. When nova is running as a different user, the image cache manager can cause tracebacks because it is not able to access the file. This fixes bug: 973377 Change-Id: I7902b024e7d564fbda97ce8532c1de84ab1a4206 Signed-off-by: Chuck Short --- nova/tests/test_imagecache.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py index 599d99ac..9cf40032 100644 --- a/nova/tests/test_imagecache.py +++ b/nova/tests/test_imagecache.py @@ -436,6 +436,7 @@ class ImageCacheManagerTestCase(test.TestCase): self.assertEquals(image_cache_manager.corrupt_base_files, []) def test_handle_base_image_used(self): + self.stubs.Set(virtutils, 'chown', lambda x, y: None) img = '123' with self._make_base_file() as fname: @@ -496,6 +497,8 @@ class ImageCacheManagerTestCase(test.TestCase): self.assertEquals(image_cache_manager.corrupt_base_files, []) def test_handle_base_image_checksum_fails(self): + self.stubs.Set(virtutils, 'chown', lambda x, y: None) + img = '123' with self._make_base_file() as fname: @@ -563,6 +566,8 @@ class ImageCacheManagerTestCase(test.TestCase): self.stubs.Set(os.path, 'exists', lambda x: exists(x)) + self.stubs.Set(virtutils, 'chown', lambda x, y: None) + # We need to stub utime as well orig_utime = os.utime self.stubs.Set(os, 'utime', lambda x, y: None)