david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iotests/236: fix transaction kwarg order

Browse Source 
It's not enough to order the kwargs for consistent QMP log output,
we must also sort any sub-dictionaries in lists that appear as values.

Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
John Snow 2019-01-30 21:26:48 -05:00 committed by Kevin Wolf
parent fff2388d5d
commit 039be85c41
2 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tests/qemu-iotests/236.out
View File

@ -45,23 +45,23 @@ write -P0xcd 0x3ff0000 64k
"actions": [ "actions": [
{ {
"data": { "data": {
"node": "drive0", "name": "bitmapB",
"name": "bitmapB" "node": "drive0"
}, },
"type": "block-dirty-bitmap-disable" "type": "block-dirty-bitmap-disable"
}, },
{ {
"data": { "data": {
"node": "drive0", "granularity": 65536,
"name": "bitmapC", "name": "bitmapC",
"granularity": 65536 "node": "drive0"
}, },
"type": "block-dirty-bitmap-add" "type": "block-dirty-bitmap-add"
}, },
{ {
"data": { "data": {
"node": "drive0", "name": "bitmapA",
"name": "bitmapA" "node": "drive0"
}, },
"type": "block-dirty-bitmap-clear" "type": "block-dirty-bitmap-clear"
}, },
@ -105,30 +105,30 @@ write -P0xcd 0x3ff0000 64k
"actions": [ "actions": [
{ {
"data": { "data": {
"node": "drive0", "name": "bitmapB",
"name": "bitmapB" "node": "drive0"
}, },
"type": "block-dirty-bitmap-disable" "type": "block-dirty-bitmap-disable"
}, },
{ {
"data": { "data": {
"node": "drive0", "granularity": 65536,
"name": "bitmapC", "name": "bitmapC",
"granularity": 65536 "node": "drive0"
}, },
"type": "block-dirty-bitmap-add" "type": "block-dirty-bitmap-add"
}, },
{ {
"data": { "data": {
"node": "drive0", "name": "bitmapC",
"name": "bitmapC" "node": "drive0"
}, },
"type": "block-dirty-bitmap-disable" "type": "block-dirty-bitmap-disable"
}, },
{ {
"data": { "data": {
"node": "drive0", "name": "bitmapC",
"name": "bitmapC" "node": "drive0"
}, },
"type": "block-dirty-bitmap-enable" "type": "block-dirty-bitmap-enable"
} }
@ -158,15 +158,15 @@ write -P0xea 0x3fe0000 64k
"actions": [ "actions": [
{ {
"data": { "data": {
"node": "drive0", "name": "bitmapA",
"name": "bitmapA" "node": "drive0"
}, },
"type": "block-dirty-bitmap-disable" "type": "block-dirty-bitmap-disable"
}, },
{ {
"data": { "data": {
"node": "drive0", "name": "bitmapC",
"name": "bitmapC" "node": "drive0"
}, },
"type": "block-dirty-bitmap-disable" "type": "block-dirty-bitmap-disable"
} }
@ -209,21 +209,21 @@ write -P0xea 0x3fe0000 64k
"actions": [ "actions": [
{ {
"data": { "data": {
"node": "drive0",
"disabled": true, "disabled": true,
"granularity": 65536,
"name": "bitmapD", "name": "bitmapD",
"granularity": 65536 "node": "drive0"
}, },
"type": "block-dirty-bitmap-add" "type": "block-dirty-bitmap-add"
}, },
{ {
"data": { "data": {
"node": "drive0",
"target": "bitmapD",
"bitmaps": [ "bitmaps": [
"bitmapB", "bitmapB",
"bitmapC" "bitmapC"
] ],
"node": "drive0",
"target": "bitmapD"
}, },
"type": "block-dirty-bitmap-merge" "type": "block-dirty-bitmap-merge"
}, },
@ -273,21 +273,21 @@ write -P0xea 0x3fe0000 64k
"actions": [ "actions": [
{ {
"data": { "data": {
"node": "drive0",
"disabled": true, "disabled": true,
"granularity": 65536,
"name": "bitmapD", "name": "bitmapD",
"granularity": 65536 "node": "drive0"
}, },
"type": "block-dirty-bitmap-add" "type": "block-dirty-bitmap-add"
}, },
{ {
"data": { "data": {
"node": "drive0",
"target": "bitmapD",
"bitmaps": [ "bitmaps": [
"bitmapB", "bitmapB",
"bitmapC" "bitmapC"
] ],
"node": "drive0",
"target": "bitmapD"
}, },
"type": "block-dirty-bitmap-merge" "type": "block-dirty-bitmap-merge"
} }

21
tests/qemu-iotests/iotests.py
View File

@ -76,15 +76,16 @@ def qemu_img(*args):
sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args)))) sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args))))
return exitcode return exitcode
def ordered_kwargs(kwargs): def ordered_qmp(qmsg):
# kwargs prior to 3.6 are not ordered, so: # Dictionaries are not ordered prior to 3.6, therefore:
od = OrderedDict() if isinstance(qmsg, list):
for k, v in sorted(kwargs.items()): return [ordered_qmp(atom) for atom in qmsg]
if isinstance(v, dict): if isinstance(qmsg, dict):
od[k] = ordered_kwargs(v) od = OrderedDict()
else: for k, v in sorted(qmsg.items()):
od[k] = v od[k] = ordered_qmp(v)
return od return od
return qmsg
def qemu_img_create(*args): def qemu_img_create(*args):
args = list(args) args = list(args)
@ -506,7 +507,7 @@ class VM(qtest.QEMUQtestMachine):
def qmp_log(self, cmd, filters=[], indent=None, **kwargs): def qmp_log(self, cmd, filters=[], indent=None, **kwargs):
full_cmd = OrderedDict(( full_cmd = OrderedDict((
("execute", cmd), ("execute", cmd),
("arguments", ordered_kwargs(kwargs)) ("arguments", ordered_qmp(kwargs))
)) ))
log(full_cmd, filters, indent=indent) log(full_cmd, filters, indent=indent)
result = self.qmp(cmd, **kwargs) result = self.qmp(cmd, **kwargs)