openstack
/
magnum
Code Issues Proposed changes

Merge "Fix string formatting bug"

This commit is contained in:
Jenkins 2016-02-16 21:34:39 +00:00 committed by Gerrit Code Review
parent e15a6421f1 f4f94e9b4b
commit 18a6cf6f97
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnum/tests/functional/common/utils.py
View File

@ -89,8 +89,8 @@ def wait_for_condition(condition, interval=1, timeout=40):
if result:
return result
time.sleep(interval)
raise Exception("Timed out after %s seconds. Started " +
"on %s and ended on %s" % (timeout, start_time, end_time))
raise Exception(("Timed out after %s seconds. Started " +
"on %s and ended on %s") % (timeout, start_time, end_time))
def memoized(func):