Also, change variable names and messages to be more
generic.
Signed-off-by: Lucas Meneghel Rodrigues <lmr@xxxxxxxxxx>
---
client/tests/kvm/kvm_vm.py | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index a8d96ca..3d604c4 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -339,20 +339,27 @@ class VM:
if params.get("md5sum_1m"):
logging.debug("Comparing expected MD5 sum with MD5 sum of "
"first MB of ISO file...")
- actual_md5sum = kvm_utils.md5sum_file(iso, 1048576)
- expected_md5sum = params.get("md5sum_1m")
+ actual_hash = kvm_utils.md5sum_file(iso, 1048576)
+ expected_hash = params.get("md5sum_1m")
compare = True
elif params.get("md5sum"):
logging.debug("Comparing expected MD5 sum with MD5 sum of ISO "
"file...")
- actual_md5sum = kvm_utils.md5sum_file(iso)
- expected_md5sum = params.get("md5sum")
+ actual_hash = kvm_utils.md5sum_file(iso)
+ expected_hash = params.get("md5sum")
+ compare = True
+ elif params.get("sha1sum"):
+ logging.debug("Comparing expected SHA1 sum with SHA1 sum of "
+ "ISO file...")
+ actual_hash = kvm_utils.md5sum_file(iso)
+ expected_hash = params.get("md5sum")
compare = True
if compare:
- if actual_md5sum == expected_md5sum:
- logging.debug("MD5 sums match")
+ if actual_hash == expected_hash:
+ logging.debug("Hashes match")
else:
- logging.error("Actual MD5 sum differs from expected one")
+ logging.error("Actual hash %s differs from expected "
+ "one %s", actual_hash, expected_hash)
return False
# Make sure the following code is not executed by more than one thread
--
1.6.2.5
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
