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

Side by Side Diff: au_test_harness/au_test.py

Issue 6857004: Clean up extreme verbosity of logs in test harness. (Closed) Base URL: http://git.chromium.org/git/crostestutils.git@master
Patch Set: FOr dj Created 9 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | au_test_harness/au_worker.py » ('j') | au_test_harness/cros_au_test_harness.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 """Module containing a test suite that is run to test auto updates.""" 5 """Module containing a test suite that is run to test auto updates."""
6 6
7 import os 7 import os
8 import tempfile 8 import tempfile
9 import time 9 import time
10 import unittest 10 import unittest
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 # Cache away options to instantiate workers later. 75 # Cache away options to instantiate workers later.
76 cls.options = options 76 cls.options = options
77 77
78 def AttemptUpdateWithPayloadExpectedFailure(self, payload, expected_msg): 78 def AttemptUpdateWithPayloadExpectedFailure(self, payload, expected_msg):
79 """Attempt a payload update, expect it to fail with expected log""" 79 """Attempt a payload update, expect it to fail with expected log"""
80 try: 80 try:
81 self.worker.UpdateUsingPayload(payload) 81 self.worker.UpdateUsingPayload(payload)
82 except UpdateException as err: 82 except UpdateException as err:
83 # Will raise ValueError if expected is not found. 83 # Will raise ValueError if expected is not found.
84 if re.search(re.escape(expected_msg), err.stdout, re.MULTILINE): 84 if re.search(re.escape(expected_msg), err.output, re.MULTILINE):
85 return 85 return
86 else: 86 else:
87 cros_lib.Warning("Didn't find '%s' in:" % expected_msg) 87 cros_lib.Warning("Didn't find '%s' in:" % expected_msg)
88 cros_lib.Warning(err.stdout) 88 cros_lib.Warning(err.output)
89 89
90 self.fail('We managed to update when failure was expected') 90 self.fail('We managed to update when failure was expected')
91 91
92 def AttemptUpdateWithFilter(self, filter, proxy_port=8081): 92 def AttemptUpdateWithFilter(self, filter, proxy_port=8081):
93 """Update through a proxy, with a specified filter, and expect success.""" 93 """Update through a proxy, with a specified filter, and expect success."""
94 self.worker.PrepareBase(self.target_image_path) 94 self.worker.PrepareBase(self.target_image_path)
95 95
96 # The devserver runs at port 8080 by default. We assume that here, and 96 # The devserver runs at port 8080 by default. We assume that here, and
97 # start our proxy at a different one. We then tell our update tools to 97 # start our proxy at a different one. We then tell our update tools to
98 # have the client connect to our proxy_port instead of 8080. 98 # have the client connect to our proxy_port instead of 8080.
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 url = 'http://gsdview.appspot.com/chromeos-localmirror/' \ 275 url = 'http://gsdview.appspot.com/chromeos-localmirror/' \
276 'autest-images/corrupted_image.gz' 276 'autest-images/corrupted_image.gz'
277 payload = os.path.join(self.download_folder, 'corrupted.gz') 277 payload = os.path.join(self.download_folder, 'corrupted.gz')
278 278
279 # Read from the URL and write to the local file 279 # Read from the URL and write to the local file
280 urllib.urlretrieve(url, payload) 280 urllib.urlretrieve(url, payload)
281 281
282 # This update is expected to fail... 282 # This update is expected to fail...
283 expected_msg = 'zlib inflate() error:-3' 283 expected_msg = 'zlib inflate() error:-3'
284 self.AttemptUpdateWithPayloadExpectedFailure(payload, expected_msg) 284 self.AttemptUpdateWithPayloadExpectedFailure(payload, expected_msg)
OLDNEW
« no previous file with comments | « no previous file | au_test_harness/au_worker.py » ('j') | au_test_harness/cros_au_test_harness.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698