From: Dan Mick <dan.mick@redhat.com>
Date: Fri, 12 Jun 2015 05:43:00 +0000 (-0700)
Subject: lock.py: json-query was matching any; make it match all
X-Git-Tag: 1.1.0~919^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F517%2Fhead;p=teuthology.git

lock.py: json-query was matching any; make it match all

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 3eaf0b390..0d100981a 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -145,8 +145,10 @@ def json_matching_statuses(json_file_or_str, statuses):
     return_statuses = list()
     for status in statuses:
         for k, v in query.iteritems():
-            if misc.is_in_dict(k, v, status):
-                return_statuses.append(status)
+            if not misc.is_in_dict(k, v, status):
+                break
+        else:
+            return_statuses.append(status)
 
     return return_statuses