提交 7301258b 编写于 作者: H Haotong Chen

usb_common:changed imports

Modified imported modules to make it compatible with both
python 2.6 and 2.7
Signed-off-by: NHaotong Chen <hachen@redhat.com>
上级 e2a8b737
import json
try:
import simplejson as json
except ImportError:
import json
from collections import OrderedDict, Counter
from collections import OrderedDict
from virttest import utils_misc
......@@ -106,8 +109,9 @@ def verify_usb_device_in_guest(params, session, devs):
if dev[1] not in output:
return False
# match number of devices
counter = Counter(dev[1] for dev in devs)
for k, v in counter.items():
dev_list = [dev[1] for dev in devs]
dev_nums = dict((i, dev_list.count(i)) for i in dev_list)
for k, v in dev_nums.items():
if output.count(k) != v:
return False
return True
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册