Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(624)

Unified Diff: bin/cros_au_test_harness.py

Issue 4137010: Re-try with full updates if first delta fails. (Closed) Base URL: http://git.chromium.org/git/crosutils.git
Patch Set: Change back test Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bin/cros_au_test_harness.py
diff --git a/bin/cros_au_test_harness.py b/bin/cros_au_test_harness.py
index d88b353a72de825bfa1ffc781d00b8bb4b6d0331..fdd4c0e23fe5ae81666c3743432887e07f5beea3 100755
--- a/bin/cros_au_test_harness.py
+++ b/bin/cros_au_test_harness.py
@@ -135,7 +135,17 @@ class AUTest(object):
# Update to - all tests should pass on new image.
Info('Updating from base image on vm to target image.')
- self.UpdateImage(target_image_path)
+ try:
+ self.UpdateImage(target_image_path)
+ except:
+ if self.use_delta_updates:
+ Warning('Delta update failed, disabling delta updates and retrying.')
+ self.use_delta_updates = False
+ self.source_image = ''
+ self.UpdateImage(target_image_path)
+ else:
+ raise
+
self.VerifyImage(100)
if self.use_delta_updates: self.source_image = target_image_path
@@ -145,8 +155,6 @@ class AUTest(object):
self.UpdateImage(base_image_path)
self.VerifyImage(percent_passed)
- # TODO(sosa): Re-enable once we have a good way of checking for version
- # compatibility.
def testFullUpdateWipeStateful(self):
"""Tests if we can update after cleaning the stateful partition.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698