[bmap-tools] [PATCH 12/16] test_api_base: rename _copy_image
Artem Bityutskiy
dedekind1 at gmail.com
Mon Nov 4 03:05:32 EST 2013
From: Artem Bityutskiy <artem.bityutskiy at intel.com>
This function copies and verifies, so let's call it '_copy_and_verify_image()'.
Change-Id: Ifd67af5a3eee73dc755097462410bcc1835a145c
Signed-off-by: Artem Bityutskiy <artem.bityutskiy at intel.com>
---
tests/test_api_base.py | 47 +++++++++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 20 deletions(-)
diff --git a/tests/test_api_base.py b/tests/test_api_base.py
index 6e94a32..2a9ce10 100644
--- a/tests/test_api_base.py
+++ b/tests/test_api_base.py
@@ -174,9 +174,10 @@ def _calculate_chksum(file_path):
file_obj.close()
return hash_obj.hexdigest()
-def _copy_image(image, dest, bmap, image_chksum, image_size):
+def _copy_and_verify_image(image, dest, bmap, image_chksum, image_size):
"""
- Copy image 'image' using bmap file 'bmap' to the destination file 'dest'.
+ Copy image 'image' using bmap file 'bmap' to the destination file 'dest'
+ and verify the resulting image checksum.
"""
f_image = TransRead.TransRead(image)
@@ -241,7 +242,8 @@ def _do_test(image, image_size, delete=True):
creator = BmapCreate.BmapCreate(image, f_bmap1.name)
creator.generate()
- _copy_image(image, f_copy.name, f_bmap1.name, image_chksum, image_size)
+ _copy_and_verify_image(image, f_copy.name, f_bmap1.name, image_chksum,
+ image_size)
# Make sure that holes in the copy are identical to holes in the random
# sparse file.
@@ -253,7 +255,8 @@ def _do_test(image, image_size, delete=True):
creator = BmapCreate.BmapCreate(image, f_bmap2)
creator.generate()
- _copy_image(image, f_copy.name, f_bmap2.name, image_chksum, image_size)
+ _copy_and_verify_image(image, f_copy.name, f_bmap2.name, image_chksum,
+ image_size)
_compare_holes(image, f_copy.name)
# Make sure the bmap files generated at pass 1 and pass 2 are identical
@@ -264,40 +267,44 @@ def _do_test(image, image_size, delete=True):
#
for compressed in _generate_compressed_files(image, delete=delete):
- _copy_image(compressed, f_copy.name, f_bmap1.name, image_chksum,
- image_size)
+ _copy_and_verify_image(compressed, f_copy.name, f_bmap1.name,
+ image_chksum, image_size)
# Test without setting the size
- _copy_image(compressed, f_copy.name, f_bmap1.name, image_chksum, None)
+ _copy_and_verify_image(compressed, f_copy.name, f_bmap1.name,
+ image_chksum, None)
# Append a "file:" prefixe to make BmapCopy use urllib
compressed = "file:" + compressed
- _copy_image(compressed, f_copy.name, f_bmap1.name, image_chksum,
- image_size)
- _copy_image(compressed, f_copy.name, f_bmap1.name, image_chksum, None)
+ _copy_and_verify_image(compressed, f_copy.name, f_bmap1.name,
+ image_chksum, image_size)
+ _copy_and_verify_image(compressed, f_copy.name, f_bmap1.name,
+ image_chksum, None)
#
# Pass 5: copy without bmap and make sure it is identical to the original
# file.
- _copy_image(image, f_copy.name, None, image_chksum, image_size)
- _copy_image(image, f_copy.name, None, image_chksum, None)
+ _copy_and_verify_image(image, f_copy.name, None, image_chksum, image_size)
+ _copy_and_verify_image(image, f_copy.name, None, image_chksum, None)
#
# Pass 6: test compressed files copying without bmap
#
for compressed in _generate_compressed_files(image, delete=delete):
- _copy_image(compressed, f_copy.name, f_bmap1.name, image_chksum,
- image_size)
+ _copy_and_verify_image(compressed, f_copy.name, f_bmap1.name,
+ image_chksum, image_size)
# Test without setting the size
- _copy_image(compressed, f_copy.name, f_bmap1.name, image_chksum, None)
-
- # Append a "file:" prefixe to make BmapCopy use urllib
- _copy_image(compressed, f_copy.name, f_bmap1.name, image_chksum,
- image_size)
- _copy_image(compressed, f_copy.name, f_bmap1.name, image_chksum, None)
+ _copy_and_verify_image(compressed, f_copy.name, f_bmap1.name,
+ image_chksum, None)
+
+ # Append a "file:" prefix to make BmapCopy use urllib
+ _copy_and_verify_image(compressed, f_copy.name, f_bmap1.name,
+ image_chksum, image_size)
+ _copy_and_verify_image(compressed, f_copy.name, f_bmap1.name,
+ image_chksum, None)
# Close temporary files, which will also remove them
f_copy.close()
--
1.8.1.4
More information about the Bmap-tools
mailing list