Merge remote-tracking branch 'theicfire/master' into next-release

This commit is contained in:
Ricardo Bartels 2019-05-09 13:38:37 +02:00
commit df2bbdbf51

View File

@ -240,8 +240,9 @@ class JsonRuleProcessor:
for kv in equality_list: for kv in equality_list:
k, v = kv.split(',') k, v = kv.split(',')
key, alias = _getKeyAlias(k) key, alias = _getKeyAlias(k)
if (self.helper.equals(key, v) is False): if (self.helper.equals(key, v) == False):
failure += " Value for key %s did not match %s." % (alias, v) failure += " Key %s mismatch. %s != %s" % (alias, v,
self.helper.get(key))
return failure return failure
def checkNonEquality(self, equality_list): def checkNonEquality(self, equality_list):
@ -250,7 +251,8 @@ class JsonRuleProcessor:
k, v = kv.split(',') k, v = kv.split(',')
key, alias = _getKeyAlias(k) key, alias = _getKeyAlias(k)
if (self.helper.equals(key, v) == True): if (self.helper.equals(key, v) == True):
failure += " Value for key %s matches %s." % (alias, v) failure += " Key %s match found. %s == %s" % (alias, v,
self.helper.get(key))
return failure return failure
def checkThreshold(self, key, alias, r): def checkThreshold(self, key, alias, r):