e21b5f34d6
When dumping an object into the log, there are differences between Python 2 and 3. First, unicode strings are prefixed by 'u' in Python 2 (they are no longer in 3, because unicode strings are the default there). Second, the order of keys in dicts may differ. Third, especially long numbers are longs in Python 2 and thus get an 'L' suffix, which does not happen in Python 3. We can get around all of these differences by dumping objects (lists and dicts) in a language-independent format, namely JSON. The JSON generator even allows emitting dicts with their keys sorted alphabetically. This changes the output of all tests that use these logging functions (dict keys are ordered now, strings in dicts are now enclosed in double quotes instead of single quotes, the 'L' suffix of large integers is dropped, and "true" and "false" are now in lower case). The quote change necessitates a small change to a filter used in test 207. Suggested-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Cleber Rosa <crosa@redhat.com> Message-Id: <20181022135307.14398-10-mreitz@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
68 lines
1.1 KiB
Plaintext
68 lines
1.1 KiB
Plaintext
--- Setting up images ---
|
|
|
|
Done
|
|
|
|
--- Launching VM ---
|
|
|
|
Done
|
|
|
|
--- Setting up Fleecing Graph ---
|
|
|
|
{"return": {}}
|
|
{"return": {}}
|
|
|
|
--- Setting up NBD Export ---
|
|
|
|
{"return": {}}
|
|
{"return": {}}
|
|
|
|
--- Sanity Check ---
|
|
|
|
read -P0x5d 0 64k
|
|
read -P0xd5 1M 64k
|
|
read -P0xdc 32M 64k
|
|
read -P0xcd 0x3ff0000 64k
|
|
read -P0 0x00f8000 32k
|
|
read -P0 0x2010000 32k
|
|
read -P0 0x3fe0000 64k
|
|
|
|
--- Testing COW ---
|
|
|
|
write -P0xab 0 64k
|
|
{"return": ""}
|
|
write -P0xad 0x00f8000 64k
|
|
{"return": ""}
|
|
write -P0x1d 0x2008000 64k
|
|
{"return": ""}
|
|
write -P0xea 0x3fe0000 64k
|
|
{"return": ""}
|
|
|
|
--- Verifying Data ---
|
|
|
|
read -P0x5d 0 64k
|
|
read -P0xd5 1M 64k
|
|
read -P0xdc 32M 64k
|
|
read -P0xcd 0x3ff0000 64k
|
|
read -P0 0x00f8000 32k
|
|
read -P0 0x2010000 32k
|
|
read -P0 0x3fe0000 64k
|
|
|
|
--- Cleanup ---
|
|
|
|
{"return": {}}
|
|
{"data": {"device": "drive0", "len": 67108864, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
|
|
{"return": {}}
|
|
{"return": {}}
|
|
|
|
--- Confirming writes ---
|
|
|
|
read -P0xab 0 64k
|
|
read -P0xad 0x00f8000 64k
|
|
read -P0x1d 0x2008000 64k
|
|
read -P0xea 0x3fe0000 64k
|
|
read -P0xd5 0x108000 32k
|
|
read -P0xdc 32M 32k
|
|
read -P0xcd 0x3ff0000 64k
|
|
|
|
Done
|