]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
lock.py: json-query was matching any; make it match all 517/head
authorDan Mick <dan.mick@redhat.com>
Fri, 12 Jun 2015 05:43:00 +0000 (22:43 -0700)
committerDan Mick <dan.mick@redhat.com>
Fri, 12 Jun 2015 05:43:00 +0000 (22:43 -0700)
Signed-off-by: Dan Mick <dan.mick@redhat.com>
teuthology/lock.py

index 3eaf0b3909492e4e5974db0eb378e804b7d6e98c..0d100981ad2bb1bf956082d8284b8a74bf1e18ab 100644 (file)
@@ -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