diff --git a/tests/auto/api.json b/tests/auto/api.json index 97bd1ebf..715cb67d 100644 --- a/tests/auto/api.json +++ b/tests/auto/api.json @@ -326,7 +326,8 @@ "ruleId": "Uuid" }, "returns": { - "rule": "$ref:Rule" + "o:rule": "$ref:Rule", + "ruleError": "$ref:RuleError" } }, "Rules.GetRules": { diff --git a/tests/scripts/guh-cli.py b/tests/scripts/guh-cli.py index 8986cc9a..d30dba35 100755 --- a/tests/scripts/guh-cli.py +++ b/tests/scripts/guh-cli.py @@ -809,6 +809,7 @@ def list_logEntries(): value = "inactive" if entry['source'] == "LoggingSourceStates": + print "have state change" typeId = entry['typeId'] sourceType = "State Changed" symbolString = "->" @@ -828,9 +829,10 @@ def list_logEntries(): device = get_device(entry['deviceId']) if device is not None: deviceName = device['name'] - deviceIdCache[entry['deviceId']] = deviceName else: - deviceName = typeId + deviceName = entry['deviceId'] + deviceIdCache[entry['deviceId']] = deviceName + print "added entryp to devicechace 1", deviceName, entry['deviceId'] if entry['source'] == "LoggingSourceActions": @@ -856,6 +858,7 @@ def list_logEntries(): else: deviceName = entry['deviceId'] deviceIdCache[entry['deviceId']] = deviceName + print "added entryp to devicechace 2", deviceName if entry['source'] == "LoggingSourceEvents": typeId = entry['typeId'] @@ -869,14 +872,16 @@ def list_logEntries(): eventTypeIdCache[typeId] = sourceName value = entry['value'] if entry['deviceId'] in deviceIdCache: + print "entry is in devicecache" deviceName = deviceIdCache[entry['deviceId']] else: device = get_device(entry['deviceId']) if device is not None: deviceName = device['name'] else: - devieName = entry['deviceId'] + deviceName = entry['deviceId'] deviceIdCache[entry['deviceId']] = deviceName + print "added entryp to devicechace 3", deviceName if entry['source'] == "LoggingSourceRules":