archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve reporting of packing & resolve an exception when key not found

Browse Source
This commit is contained in:
Campbell Barton
2014-12-18 11:30:51 +01:00
parent 05ebc867e0
commit 5f619eef9f
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/batch/bam_pack_test.py
View File

@@ -205,14 +205,14 @@ def pack_blend_test(blendfile_src, log, blender_bin):
shutil.rmtree(TEMP_EXTRACT) shutil.rmtree(TEMP_EXTRACT)
del returncode del returncode
is_error = False error_num = 0
# just extra check... not essential but means we know quickly if library state is different # just extra check... not essential but means we know quickly if library state is different
if stdout_src.count(b'LIB ERROR') != stdout_dst.count(b'LIB ERROR'): if stdout_src.count(b'LIB ERROR') != stdout_dst.count(b'LIB ERROR'):
log.error("Library errors differ in packed library, with the following output") log.error("Library errors differ in packed library, with the following output")
log.error("*** SOURCE STDOUT ***\n" + stdout_src.decode('utf-8')) log.error("*** SOURCE STDOUT ***\n" + stdout_src.decode('utf-8'))
log.error("*** PACKED STDOUT ***\n" + stdout_dst.decode('utf-8')) log.error("*** PACKED STDOUT ***\n" + stdout_dst.decode('utf-8'))
is_error = True error_num += 1
data_src_basename = {os.path.basename(f_full): (f_full, f_ok) for f_full, f_ok in data_src} data_src_basename = {os.path.basename(f_full): (f_full, f_ok) for f_full, f_ok in data_src}
data_dst_basename = {os.path.basename(f_full): (f_full, f_ok) for f_full, f_ok in data_dst} data_dst_basename = {os.path.basename(f_full): (f_full, f_ok) for f_full, f_ok in data_dst}
@@ -220,15 +220,26 @@ def pack_blend_test(blendfile_src, log, blender_bin):
# do magic! # do magic!
for f_src_nameonly, (f_src_full, f_src_ok) in data_src_basename.items(): for f_src_nameonly, (f_src_full, f_src_ok) in data_src_basename.items():
if f_src_ok: if f_src_ok:
f_dst_full, f_dst_ok = data_dst_basename[f_src_nameonly] f_pair = data_dst_basename.get(f_src_nameonly)
if f_pair is None:
# the key should be found even if the files missing
log.error("%r (%r) missing from destination (internal error?)!" % (blendfile_src, f_src_full))
error_num += 1
continue
f_dst_full, f_dst_ok = f_pair
if not f_dst_ok: if not f_dst_ok:
log.error("%r (%r -> %r) failed!" % (blendfile_src, f_src_full, f_dst_full)) log.error("%r (%r -> %r) failed!" % (blendfile_src, f_src_full, f_dst_full))
is_error = True error_num += 1
else: else:
# log.info("found %r -> %r" % (f_src_full, f_dst_full)) # log.info("found %r -> %r" % (f_src_full, f_dst_full))
pass pass
return is_error if error_num:
log.info("BLEND FAIL (%d) %r" % (error_num, blendfile_src))
return (error_num != 0)
def pack_blend_recursive_test( def pack_blend_recursive_test(