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

Unified Diff: bin/cros_au_test_harness.py

Issue 4170004: Add delta support to the update test harness. (Closed) Base URL: http://git.chromium.org/git/crosutils.git
Patch Set: Fixes after testing 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 d1ec151aeb7830d61618125f8acc30598311c52f..9036dc95b21ec85148317308b226ba99ecca8fb4 100755
--- a/bin/cros_au_test_harness.py
+++ b/bin/cros_au_test_harness.py
@@ -33,6 +33,8 @@ _VERIFY_SUITE = 'suite_Smoke'
class AUTest(object):
"""Abstract interface that defines an Auto Update test."""
+ source_image = ''
+ use_delta_updates = False
def setUp(self):
unittest.TestCase.setUp(self)
@@ -129,11 +131,15 @@ class AUTest(object):
# with the dev channel.
percent_passed = self.VerifyImage(10)
+ if self.use_delta_updates: self.source_image = base_image_path
+
# Update to - all tests should pass on new image.
Info('Updating from base image on vm to target image.')
self.UpdateImage(target_image_path)
self.VerifyImage(100)
+ if self.use_delta_updates: self.source_image = target_image_path
+
# Update from - same percentage should pass that originally passed.
Info('Updating from updated image on vm back to base image.')
self.UpdateImage(base_image_path)
@@ -154,11 +160,15 @@ class AUTest(object):
# with the dev channel.
percent_passed = self.VerifyImage(10)
+ if self.use_delta_updates: self.source_image = base_image_path
+
# Update to - all tests should pass on new image.
Info('Updating from base image on vm to target image and wiping stateful.')
self.UpdateImage(target_image_path, 'clean')
self.VerifyImage(100)
+ if self.use_delta_updates: self.source_image = target_image_path
+
# Update from - same percentage should pass that originally passed.
Info('Updating from updated image back to base image and wiping stateful.')
self.UpdateImage(base_image_path, 'clean')
@@ -185,6 +195,7 @@ class RealAUTest(unittest.TestCase, AUTest):
'--remote=%s' % remote,
stateful_change_flag,
'--verify',
+ '--src_image=%s' % self.source_image,
], enter_chroot=False)
@@ -250,6 +261,7 @@ class VirtualAUTest(unittest.TestCase, AUTest):
'--persist',
'--kvm_pid=%s' % _KVM_PID_FILE,
stateful_change_flag,
+ '--src_image=%s' % self.source_image,
], enter_chroot=False)
def VerifyImage(self, percent_required_to_pass):
@@ -282,6 +294,9 @@ if __name__ == '__main__':
help='Remote address for real test.')
parser.add_option('--no_graphics', action='store_true',
help='Disable graphics for the vm test.')
+ parser.add_option('--no_delta', action='store_false', default=True,
+ dest='delta',
+ help='Disable using delta updates.')
# Set the usage to include flags.
parser.set_usage(parser.format_help())
# Parse existing sys.argv so we can pass rest to unittest.main.
@@ -304,9 +319,12 @@ if __name__ == '__main__':
if not board:
parser.error('Need board to convert base image to vm.')
+ # Communicate flags to tests.
vm_graphics_flag = ''
if options.no_graphics: vm_graphics_flag = '--no_graphics'
+ AUTest.use_delta_updates = options.delta
+
# Only run the test harness we care about.
if options.type == 'vm':
suite = unittest.TestLoader().loadTestsFromTestCase(VirtualAUTest)
« 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