From: Zack Cerza Date: Fri, 24 Jul 2015 18:43:08 +0000 (-0600) Subject: Remove buggy error checking in lock_machines() X-Git-Tag: 1.1.0~863^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=01a6c4f795d4ab1fe980d44f9f2df10086fe2fc9;p=teuthology.git Remove buggy error checking in lock_machines() http://tracker.ceph.com/issues/12462 If lock_many() fails to create any VMs, it returns an empty dict, which was causing an exception to be raised. The existing error reporting in lock_many() should be adequate here. Signed-off-by: Zack Cerza --- diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py index a35552b457..44fe265b97 100644 --- a/teuthology/task/internal.py +++ b/teuthology/task/internal.py @@ -117,8 +117,6 @@ def lock_machines(ctx, config): newly_locked = lock.lock_many(ctx, how_many, machine_type, ctx.owner, ctx.archive, os_type, os_version, arch) - if not newly_locked and not isinstance(newly_locked, list): - raise RuntimeError('Invalid parameters specified') all_locked.update(newly_locked) if len(all_locked) == how_many: vmlist = []