← Back to branch summary

~ubuntu-branches/ubuntu/utopic/openstack-trove/utopic-proposed

« back to all changes in this revision

Viewing changes to trove/common/utils.py

  • Committer: Package Import Robot
  • Author(s): James Page, Corey Bryant, James Page
  • Date: 2014-09-25 15:57:16 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20140925155716-5elwewljjkfa0abg
Tags: 2014.2~b3-0ubuntu1
https://launchpad.net/bugs/1347567
[ Corey Bryant ]
* Enable unit test execution (LP: #1347567):
  - d/rules: Execute tests during package build.
  - d/p/skip-tests.patch: Add patch to skip broken tests.

[ James Page ]
* New upstream milestone release.
* d/rules: Tidy surplus overrides.

Show diffs side-by-side

added added

removed removed

Lines of Context:
trove/common/utils.py
272
272
 
273
273
def execute_with_timeout(*args, **kwargs):
274
274
    time = kwargs.pop('timeout', 30)
 
275
    log_output_on_error = kwargs.pop('log_output_on_error', False)
275
276
 
276
277
    timeout = Timeout(time)
277
278
    try:
278
279
        return execute(*args, **kwargs)
 
280
    except exception.ProcessExecutionError as e:
 
281
        if log_output_on_error:
 
282
            LOG.error(
 
283
                _("Command '%(cmd)s' failed. %(description)s "
 
284
                  "Exit code: %(exit_code)s\nstderr: %(stderr)s\n"
 
285
                  "stdout: %(stdout)s") %
 
286
                {'cmd': e.cmd, 'description': e.description or '',
 
287
                 'exit_code': e.exit_code, 'stderr': e.stderr,
 
288
                 'stdout': e.stdout})
 
289
        raise
279
290
    except Timeout as t:
280
291
        if t is not timeout:
281
292
            LOG.error(_("Got a timeout but not the one expected."))