almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

unified-isos: Stop erasing metadata on failure

Browse Source 
When saving new metadata fails, the images.json file would be left
empty. Instead we should not touch it at all.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-10-03 11:06:03 +02:00
parent b51a639277
commit 842e2e810e
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pungi_utils/unified_isos.py
View File

@ -92,7 +92,17 @@ class UnifiedISO(object):
shutil.rmtree(self.temp_dir)
def dump_manifest(self):
self.compose.images.dump(os.path.join(self.compose_path, 'metadata', 'images.json'))
dest = os.path.join(self.compose_path, 'metadata', 'images.json')
tmp_file = dest + '.tmp'
try:
self.compose.images.dump(tmp_file)
except:
# We failed, clean up the temporary file.
if os.path.exists(tmp_file):
os.remove(tmp_file)
raise
# Success, move the temp file to proper location.
os.rename(tmp_file, dest)
def _link_tree(self, dir, variant, arch):
blacklist_files = [".treeinfo", ".discinfo", "boot.iso", "media.repo", "extra_files.json"]

22
tests/test_unified_isos.py
View File

@ -9,7 +9,7 @@ from ConfigParser import SafeConfigParser
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
from tests.helpers import PungiTestCase, FIXTURE_DIR, touch
from tests.helpers import PungiTestCase, FIXTURE_DIR, touch, mk_boom
from pungi_utils import unified_isos
@ -35,13 +35,29 @@ class TestUnifiedIsos(PungiTestCase):
self.assertRegexpMatches(isos.temp_dir,
'^%s/' % os.path.join(self.topdir, COMPOSE_ID, 'work'))
def test_dump_manifest(self):
@mock.patch('os.rename')
def test_dump_manifest(self, rename):
compose_path = os.path.join(self.topdir, COMPOSE_ID, 'compose')
isos = unified_isos.UnifiedISO(compose_path)
isos.compose._images = mock.Mock()
isos.dump_manifest()
self.assertEqual(isos.compose._images.mock_calls,
[mock.call.dump(compose_path + '/metadata/images.json')])
[mock.call.dump(compose_path + '/metadata/images.json.tmp')])
self.assertEqual(rename.call_args_list,
[mock.call(compose_path + '/metadata/images.json.tmp',
compose_path + '/metadata/images.json')])
@mock.patch('os.rename')
def test_dump_manifest_fails(self, rename):
compose_path = os.path.join(self.topdir, COMPOSE_ID, 'compose')
isos = unified_isos.UnifiedISO(compose_path)
isos.compose._images = mock.Mock()
isos.compose._images.dump.side_effect = mk_boom()
with self.assertRaises(Exception):
isos.dump_manifest()
self.assertEqual(isos.compose._images.mock_calls,
[mock.call.dump(compose_path + '/metadata/images.json.tmp')])
self.assertEqual(rename.call_args_list, [])
class TestCreate(PungiTestCase):