Skip to contentSkip to conversation

iotests/236: fix transaction kwarg order

PATCH Applied John Snow 4 participants 5 messages Jan 31, 2019 – Feb 1, 2019

lore
Share & tools
lore

John Snow

author
#0 lore raw

PATCH 1/1 iotests/236: fix transaction kwarg order

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.

---
 tests/qemu-iotests/236.out    | 56 +++++++++++++++++------------------
 tests/qemu-iotests/iotests.py | 21 ++++++-------
 2 files changed, 39 insertions(+), 38 deletions(-)
tests/qemu-iotests/236.out +28 -28
index 1dad24db0d..bb2d71ea5e 100644
@@ -45,23 +45,23 @@ write -P0xcd 0x3ff0000 64k
     "actions": [
       {
         "data": {
-          "node": "drive0",
-          "name": "bitmapB"
+          "name": "bitmapB",
+          "node": "drive0"
         },
         "type": "block-dirty-bitmap-disable"
       },
       {
         "data": {
-          "node": "drive0",
+          "granularity": 65536,
           "name": "bitmapC",
-          "granularity": 65536
+          "node": "drive0"
         },
         "type": "block-dirty-bitmap-add"
       },
       {
         "data": {
-          "node": "drive0",
-          "name": "bitmapA"
+          "name": "bitmapA",
+          "node": "drive0"
         },
         "type": "block-dirty-bitmap-clear"
       },
@@ -105,30 +105,30 @@ write -P0xcd 0x3ff0000 64k
     "actions": [
       {
         "data": {
-          "node": "drive0",
-          "name": "bitmapB"
+          "name": "bitmapB",
+          "node": "drive0"
         },
         "type": "block-dirty-bitmap-disable"
       },
       {
         "data": {
-          "node": "drive0",
+          "granularity": 65536,
           "name": "bitmapC",
-          "granularity": 65536
+          "node": "drive0"
         },
         "type": "block-dirty-bitmap-add"
       },
       {
         "data": {
-          "node": "drive0",
-          "name": "bitmapC"
+          "name": "bitmapC",
+          "node": "drive0"
         },
         "type": "block-dirty-bitmap-disable"
       },
       {
         "data": {
-          "node": "drive0",
-          "name": "bitmapC"
+          "name": "bitmapC",
+          "node": "drive0"
         },
         "type": "block-dirty-bitmap-enable"
       }
@@ -158,15 +158,15 @@ write -P0xea 0x3fe0000 64k
     "actions": [
       {
         "data": {
-          "node": "drive0",
-          "name": "bitmapA"
+          "name": "bitmapA",
+          "node": "drive0"
         },
         "type": "block-dirty-bitmap-disable"
       },
       {
         "data": {
-          "node": "drive0",
-          "name": "bitmapC"
+          "name": "bitmapC",
+          "node": "drive0"
         },
         "type": "block-dirty-bitmap-disable"
       }
@@ -209,21 +209,21 @@ write -P0xea 0x3fe0000 64k
     "actions": [
       {
         "data": {
-          "node": "drive0",
           "disabled": true,
+          "granularity": 65536,
           "name": "bitmapD",
-          "granularity": 65536
+          "node": "drive0"
         },
         "type": "block-dirty-bitmap-add"
       },
       {
         "data": {
-          "node": "drive0",
-          "target": "bitmapD",
           "bitmaps": [
             "bitmapB",
             "bitmapC"
-          ]
+          ],
+          "node": "drive0",
+          "target": "bitmapD"
         },
         "type": "block-dirty-bitmap-merge"
       },
@@ -273,21 +273,21 @@ write -P0xea 0x3fe0000 64k
     "actions": [
       {
         "data": {
-          "node": "drive0",
           "disabled": true,
+          "granularity": 65536,
           "name": "bitmapD",
-          "granularity": 65536
+          "node": "drive0"
         },
         "type": "block-dirty-bitmap-add"
       },
       {
         "data": {
-          "node": "drive0",
-          "target": "bitmapD",
           "bitmaps": [
             "bitmapB",
             "bitmapC"
-          ]
+          ],
+          "node": "drive0",
+          "target": "bitmapD"
         },
         "type": "block-dirty-bitmap-merge"
       }
tests/qemu-iotests/iotests.py +11 -10
index cbedfaf1df..76ad52b358 100644
@@ -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))))
     return exitcode
 
-def ordered_kwargs(kwargs):
-    # kwargs prior to 3.6 are not ordered, so:
-    od = OrderedDict()
-    for k, v in sorted(kwargs.items()):
-        if isinstance(v, dict):
-            od[k] = ordered_kwargs(v)
-        else:
-            od[k] = v
-    return od
+def ordered_qmp(qmsg):
+    # Dictionaries are not ordered prior to 3.6, therefore:
+    if isinstance(qmsg, list):
+        return [ordered_qmp(atom) for atom in qmsg]
+    if isinstance(qmsg, dict):
+        od = OrderedDict()
+        for k, v in sorted(qmsg.items()):
+            od[k] = ordered_qmp(v)
+        return od
+    return qmsg
 
 def qemu_img_create(*args):
     args = list(args)
@@ -491,7 +492,7 @@ class VM(qtest.QEMUQtestMachine):
     def qmp_log(self, cmd, filters=[], indent=None, **kwargs):
         full_cmd = OrderedDict((
             ("execute", cmd),
-            ("arguments", ordered_kwargs(kwargs))
+            ("arguments", ordered_qmp(kwargs))
         ))
         log(full_cmd, filters, indent=indent)
         result = self.qmp(cmd, **kwargs)
Signature · 1 line
2.17.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 26 lines · John Snow

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.

---
 tests/qemu-iotests/236.out    | 56 +++++++++++++++++------------------
 tests/qemu-iotests/iotests.py | 21 ++++++-------
 2 files changed, 39 insertions(+), 38 deletions(-)

+++ b/tests/qemu-iotests/iotests.py

tests/qemu-iotests/iotests.py +1 -9
@@ -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))))
     return exitcode
 
-def ordered_kwargs(kwargs):
-    # kwargs prior to 3.6 are not ordered, so:
-    od = OrderedDict()
-    for k, v in sorted(kwargs.items()):
-        if isinstance(v, dict):
-            od[k] = ordered_kwargs(v)
-        else:
-            od[k] = v
-    return od
+def ordered_qmp(qmsg):

tests/qemu-iotests/iotests.py def qemu_img(*args): · line 89

Quoted 10 lines
tests/qemu-iotests/iotests.py +9 -0
+    # Dictionaries are not ordered prior to 3.6, therefore:
+    if isinstance(qmsg, list):
+        return [ordered_qmp(atom) for atom in qmsg]
+    if isinstance(qmsg, dict):
+        od = OrderedDict()
+        for k, v in sorted(qmsg.items()):
+            od[k] = ordered_qmp(v)
+        return od
+    return qmsg
 
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
Reviewed-by on v1 1/1
#3 lore raw
In reply to John Snow
Quoted 15 lines · John Snow

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.

---
  tests/qemu-iotests/236.out    | 56 +++++++++++++++++------------------
  tests/qemu-iotests/iotests.py | 21 ++++++-------
  2 files changed, 39 insertions(+), 38 deletions(-)
tests/qemu-iotests/236.out +0 -0
index 1dad24db0d..bb2d71ea5e 100644

tests/qemu-iotests/236.out write -P0xcd 0x3ff0000 64k · line 49

Quoted 5 lines
tests/qemu-iotests/236.out +0 -2
@@ -45,23 +45,23 @@ write -P0xcd 0x3ff0000 64k
      "actions": [
        {
          "data": {
-          "node": "drive0",
-          "name": "bitmapB"

We could notice during review, that things we are trying to order so hard are just not ordered in result :)))

Quoted 3 lines
tests/qemu-iotests/236.out +2 -0
+          "name": "bitmapB",
+          "node": "drive0"
          },

[..]

Quoted 16 lines
tests/qemu-iotests/iotests.py +0 -8
index cbedfaf1df..76ad52b358 100644
@@ -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))))
      return exitcode
 
-def ordered_kwargs(kwargs):
-    # kwargs prior to 3.6 are not ordered, so:
-    od = OrderedDict()
-    for k, v in sorted(kwargs.items()):
-        if isinstance(v, dict):
-            od[k] = ordered_kwargs(v)
-        else:
-            od[k] = v

tests/qemu-iotests/iotests.py def qemu_img(*args): · line 87

Quoted 10 lines
tests/qemu-iotests/iotests.py +9 -1
-    return od
+def ordered_qmp(qmsg):
+    # Dictionaries are not ordered prior to 3.6, therefore:
+    if isinstance(qmsg, list):
+        return [ordered_qmp(atom) for atom in qmsg]
+    if isinstance(qmsg, dict):
+        od = OrderedDict()
+        for k, v in sorted(qmsg.items()):
+            od[k] = ordered_qmp(v)
+        return od

or if you want:
pairs = ((k, ordered_qmp(v)) for k, v in sorted(qmsg.items())) return OrderedDict(pairs)

Quoted 6 lines
tests/qemu-iotests/iotests.py +1 -0
+    return qmsg
 
  def qemu_img_create(*args):
      args = list(args)

tests/qemu-iotests/iotests.py class VM(qtest.QEMUQtestMachine): · line 498

Quoted 8 lines
tests/qemu-iotests/iotests.py +1 -1
@@ -491,7 +492,7 @@ class VM(qtest.QEMUQtestMachine):
      def qmp_log(self, cmd, filters=[], indent=None, **kwargs):
          full_cmd = OrderedDict((
              ("execute", cmd),
-            ("arguments", ordered_kwargs(kwargs))
+            ("arguments", ordered_qmp(kwargs))
          ))
          log(full_cmd, filters, indent=indent)
          result = self.qmp(cmd, **kwargs)

anyway,

Signature · 2 lines
Best regards,
Vladimir
author
#4 lore raw
Quoted 11 lines · Vladimir Sementsov-Ogievskiy
Quoted 10 lines · John Snow

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.

---
  tests/qemu-iotests/236.out    | 56 +++++++++++++++++------------------
  tests/qemu-iotests/iotests.py | 21 ++++++-------
  2 files changed, 39 insertions(+), 38 deletions(-)
Quoted 14 lines

tests/qemu-iotests/236.out write -P0xcd 0x3ff0000 64k · line 49

Quoted 10 lines
tests/qemu-iotests/236.out +0 -2
index 1dad24db0d..bb2d71ea5e 100644
@@ -45,23 +45,23 @@ write -P0xcd 0x3ff0000 64k
      "actions": [
        {
          "data": {
-          "node": "drive0",
-          "name": "bitmapB"

We could notice during review, that things we are trying to order so hard are just not ordered in result :)))

I was in a bit of a rush before the holidays :(

Quoted 28 lines
Quoted 3 lines
tests/qemu-iotests/236.out +2 -0
+          "name": "bitmapB",
+          "node": "drive0"
          },

[..]

Quoted 22 lines
tests/qemu-iotests/iotests.py +5 -9
index cbedfaf1df..76ad52b358 100644
@@ -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))))
      return exitcode
 
-def ordered_kwargs(kwargs):
-    # kwargs prior to 3.6 are not ordered, so:
-    od = OrderedDict()
-    for k, v in sorted(kwargs.items()):
-        if isinstance(v, dict):
-            od[k] = ordered_kwargs(v)
-        else:
-            od[k] = v
-    return od
+def ordered_qmp(qmsg):
+    # Dictionaries are not ordered prior to 3.6, therefore:
+    if isinstance(qmsg, list):
+        return [ordered_qmp(atom) for atom in qmsg]
+    if isinstance(qmsg, dict):
Quoted 9 lines

tests/qemu-iotests/iotests.py def qemu_img(*args): · line 87

Quoted 4 lines
tests/qemu-iotests/iotests.py +4 -0
+        od = OrderedDict()
+        for k, v in sorted(qmsg.items()):
+            od[k] = ordered_qmp(v)
+        return od

or if you want:
pairs = ((k, ordered_qmp(v)) for k, v in sorted(qmsg.items())) return OrderedDict(pairs)

Ah, well, it already went in -- I don't think I'll send a fixup, but I do like this way more.

Thanks for the review!

Quoted 19 lines
Quoted 6 lines
tests/qemu-iotests/iotests.py +1 -0
+    return qmsg
 
  def qemu_img_create(*args):
      args = list(args)

tests/qemu-iotests/iotests.py class VM(qtest.QEMUQtestMachine): · line 498

Quoted 8 lines
tests/qemu-iotests/iotests.py +1 -1
@@ -491,7 +492,7 @@ class VM(qtest.QEMUQtestMachine):
      def qmp_log(self, cmd, filters=[], indent=None, **kwargs):
          full_cmd = OrderedDict((
              ("execute", cmd),
-            ("arguments", ordered_kwargs(kwargs))
+            ("arguments", ordered_qmp(kwargs))
          ))
          log(full_cmd, filters, indent=indent)
          result = self.qmp(cmd, **kwargs)

anyway,