mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-25 15:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "RunCommand was catching and rethrowing an exception, which seemed to generate"

Browse Source 
This reverts commit 01c84235827527cd2f938897a4a8dfcdbf877281.

BUG=chromium-os:11717
TEST=none

Review URL: http://codereview.chromium.org/6575022

Change-Id: I4e66e7b2fcf01a4cb35557bdf208f990e6d8eb2b
This commit is contained in:
Luigi Semenzato 2011-02-23 19:14:53 -08:00
parent 01c8423582
commit 3635aaa55e
2 changed files with 17 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/cros_build_lib.py
View File

@ -70,34 +70,27 @@ def RunCommand(cmd, print_cmd=True, error_ok=False, error_message=None,
(GetCallerName(), cmd, cwd)) (GetCallerName(), cmd, cwd))
for retry_count in range(num_retries + 1): for retry_count in range(num_retries + 1):
try:
# If it's not the first attempt, it's a retry
if retry_count > 0 and print_cmd:
Info('PROGRAM(%s) -> RunCommand: retrying %r in dir %s' %
(GetCallerName(), cmd, cwd))
proc = subprocess.Popen(cmd, cwd=cwd, stdin=stdin, proc = subprocess.Popen(cmd, cwd=cwd, stdin=stdin,
stdout=stdout, stderr=stderr) stdout=stdout, stderr=stderr)
(output, error) = proc.communicate(input) (output, error) = proc.communicate(input)
if exit_code and retry_count == num_retries:
return proc.returncode
# if the command worked, don't retry any more.
if proc.returncode == 0: if proc.returncode == 0:
break break
# If the command (and all retries) failed, handle error result
if proc.returncode != 0:
if error_ok:
if print_cmd:
Warning('Command "%r" failed.\n' % (cmd) +
(error_message or error or output or ''))
else:
raise RunCommandException('Command "%r" failed.\n' % (cmd) + raise RunCommandException('Command "%r" failed.\n' % (cmd) +
(error_message or error or output or '')) (error_message or error or output or ''))
except RunCommandException as e:
# return final result if not error_ok and retry_count == num_retries:
if exit_code: raise e
return proc.returncode
else: else:
Warning(str(e))
if print_cmd:
Info('PROGRAM(%s) -> RunCommand: retrying %r in dir %s' %
(GetCallerName(), cmd, cwd))
return output return output

76
lib/cros_build_lib_unittest.py
View File

@ -1,76 +0,0 @@
#!/usr/bin/python
#
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Unit tests for cros_build_lib."""
import unittest
import cros_build_lib
class CrosBuildLibTest(unittest.TestCase):
"""Test class for cros_build_lib."""
def testRunCommandSimple(self):
"""Test that RunCommand can run a simple successful command."""
result = cros_build_lib.RunCommand(['ls'],
# Keep the test quiet options
print_cmd=False,
redirect_stdout=True,
redirect_stderr=True,
# Test specific options
exit_code=True)
self.assertEqual(result, 0)
def testRunCommandError(self):
"""Test that RunCommand can return an error code for a failed command."""
result = cros_build_lib.RunCommand(['ls', '/nosuchdir'],
# Keep the test quiet options
print_cmd=False,
redirect_stdout=True,
redirect_stderr=True,
# Test specific options
error_ok=True,
exit_code=True)
self.assertNotEqual(result, 0)
def testRunCommandErrorRetries(self):
"""Test that RunCommand can retry a failed command that always fails."""
# We don't actually check that it's retrying, just exercise the code path.
result = cros_build_lib.RunCommand(['ls', '/nosuchdir'],
# Keep the test quiet options
print_cmd=False,
redirect_stdout=True,
redirect_stderr=True,
# Test specific options
num_retries=2,
error_ok=True,
exit_code=True)
self.assertNotEqual(result, 0)
def testRunCommandErrorException(self):
"""Test that RunCommand can throw an exception when a command fails."""
function = lambda : cros_build_lib.RunCommand(['ls', '/nosuchdir'],
# Keep the test quiet options
print_cmd=False,
redirect_stdout=True,
redirect_stderr=True)
self.assertRaises(cros_build_lib.RunCommandException, function)
def testRunCommandCaptureOutput(self):
"""Test that RunCommand can capture stdout if a command succeeds."""
result = cros_build_lib.RunCommand(['echo', '-n', 'Hi'],
# Keep the test quiet options
print_cmd=False,
redirect_stdout=True,
redirect_stderr=True)
self.assertEqual(result, 'Hi')
if __name__ == '__main__':
unittest.main()