|
@@ -237,6 +237,7 @@ class Test(object):
|
|
|
# events in result. Fail if there's not any.
|
|
# events in result. Fail if there's not any.
|
|
|
for exp_name, exp_event in expect.items():
|
|
for exp_name, exp_event in expect.items():
|
|
|
exp_list = []
|
|
exp_list = []
|
|
|
|
|
+ res_event = {}
|
|
|
log.debug(" matching [%s]" % exp_name)
|
|
log.debug(" matching [%s]" % exp_name)
|
|
|
for res_name, res_event in result.items():
|
|
for res_name, res_event in result.items():
|
|
|
log.debug(" to [%s]" % res_name)
|
|
log.debug(" to [%s]" % res_name)
|
|
@@ -253,7 +254,10 @@ class Test(object):
|
|
|
if exp_event.optional():
|
|
if exp_event.optional():
|
|
|
log.debug(" %s does not match, but is optional" % exp_name)
|
|
log.debug(" %s does not match, but is optional" % exp_name)
|
|
|
else:
|
|
else:
|
|
|
- exp_event.diff(res_event)
|
|
|
|
|
|
|
+ if not res_event:
|
|
|
|
|
+ log.debug(" res_event is empty");
|
|
|
|
|
+ else:
|
|
|
|
|
+ exp_event.diff(res_event)
|
|
|
raise Fail(self, 'match failure');
|
|
raise Fail(self, 'match failure');
|
|
|
|
|
|
|
|
match[exp_name] = exp_list
|
|
match[exp_name] = exp_list
|