summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKarel Zak2018-04-04 14:22:04 +0200
committerKarel Zak2018-04-04 14:22:04 +0200
commita40c12837f1dc0713b68da0b3724da40b3aea5bc (patch)
treefcec66daf6d350b7802d1b49936a45bedc494748 /tests
parentlsblk: consolidate column types for JSON and qsort() (diff)
downloadkernel-qcow2-util-linux-a40c12837f1dc0713b68da0b3724da40b3aea5bc.tar.gz
kernel-qcow2-util-linux-a40c12837f1dc0713b68da0b3724da40b3aea5bc.tar.xz
kernel-qcow2-util-linux-a40c12837f1dc0713b68da0b3724da40b3aea5bc.zip
tests: update JSON outputs
It does not contains extra space after ":" separator anymore. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/expected/libsmartcols/fromfile-tree-json20
-rw-r--r--tests/expected/lsmem/lsmem-s390-zvm-6g20
-rw-r--r--tests/expected/lsmem/lsmem-x86_64-16g60
3 files changed, 50 insertions, 50 deletions
diff --git a/tests/expected/libsmartcols/fromfile-tree-json b/tests/expected/libsmartcols/fromfile-tree-json
index 02aa98610..5b3546d0a 100644
--- a/tests/expected/libsmartcols/fromfile-tree-json
+++ b/tests/expected/libsmartcols/fromfile-tree-json
@@ -1,28 +1,28 @@
{
"testtable": [
- {"tree": "aaaa", "id": "1", "parent": "0", "strings": "qqqqqqqqqqqqqqqqqX",
+ {"tree":"aaaa", "id":"1", "parent":"0", "strings":"qqqqqqqqqqqqqqqqqX",
"children": [
- {"tree": "bbb", "id": "2", "parent": "1", "strings": "dddddddddddddX",
+ {"tree":"bbb", "id":"2", "parent":"1", "strings":"dddddddddddddX",
"children": [
- {"tree": "ee", "id": "5", "parent": "2", "strings": "ddddddddddddddddddddddddddX"},
- {"tree": "ffff", "id": "6", "parent": "2", "strings": "jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjX"}
+ {"tree":"ee", "id":"5", "parent":"2", "strings":"ddddddddddddddddddddddddddX"},
+ {"tree":"ffff", "id":"6", "parent":"2", "strings":"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjX"}
]
},
- {"tree": "ccccc", "id": "3", "parent": "1", "strings": "ffffffffffffffffffffffffffffffffffffffffX",
+ {"tree":"ccccc", "id":"3", "parent":"1", "strings":"ffffffffffffffffffffffffffffffffffffffffX",
"children": [
- {"tree": "gggggg", "id": "7", "parent": "3", "strings": "mmmmmmmmmmmmmmmmmmmX",
+ {"tree":"gggggg", "id":"7", "parent":"3", "strings":"mmmmmmmmmmmmmmmmmmmX",
"children": [
- {"tree": "hhh", "id": "8", "parent": "7", "strings": "lllllllllllllllllllllllllllllllllllllX",
+ {"tree":"hhh", "id":"8", "parent":"7", "strings":"lllllllllllllllllllllllllllllllllllllX",
"children": [
- {"tree": "iiiiii", "id": "9", "parent": "8", "strings": "yyyyyyyyyyyyyyyyyyyyyyyyyyyyX"}
+ {"tree":"iiiiii", "id":"9", "parent":"8", "strings":"yyyyyyyyyyyyyyyyyyyyyyyyyyyyX"}
]
},
- {"tree": "jj", "id": "10", "parent": "7", "strings": "pppppppppX"}
+ {"tree":"jj", "id":"10", "parent":"7", "strings":"pppppppppX"}
]
}
]
},
- {"tree": "dddddd", "id": "4", "parent": "1", "strings": "ssssssssssX"}
+ {"tree":"dddddd", "id":"4", "parent":"1", "strings":"ssssssssssX"}
]
}
]
diff --git a/tests/expected/lsmem/lsmem-s390-zvm-6g b/tests/expected/lsmem/lsmem-s390-zvm-6g
index b4be21ea8..ab03836bc 100644
--- a/tests/expected/lsmem/lsmem-s390-zvm-6g
+++ b/tests/expected/lsmem/lsmem-s390-zvm-6g
@@ -94,16 +94,16 @@ RANGE SIZE STATE REMOVABLE BLOCK NODE
$ lsmem --json --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
{
"memory": [
- {"range": "0x0000000000000000-0x000000006fffffff", "size": "1.8G", "state": "online", "removable": "yes", "block": "0-6", "node": "0"},
- {"range": "0x0000000070000000-0x000000007fffffff", "size": "256M", "state": "online", "removable": "no", "block": "7", "node": "0"},
- {"range": "0x0000000080000000-0x000000009fffffff", "size": "512M", "state": "online", "removable": "yes", "block": "8-9", "node": "0"},
- {"range": "0x00000000a0000000-0x00000000bfffffff", "size": "512M", "state": "online", "removable": "no", "block": "10-11", "node": "0"},
- {"range": "0x00000000c0000000-0x00000000dfffffff", "size": "512M", "state": "online", "removable": "yes", "block": "12-13", "node": "0"},
- {"range": "0x00000000e0000000-0x00000000efffffff", "size": "256M", "state": "offline", "removable": "-", "block": "14", "node": "0"},
- {"range": "0x00000000f0000000-0x00000000ffffffff", "size": "256M", "state": "online", "removable": "yes", "block": "15", "node": "0"},
- {"range": "0x0000000100000000-0x000000011fffffff", "size": "512M", "state": "online", "removable": "no", "block": "16-17", "node": "0"},
- {"range": "0x0000000120000000-0x000000013fffffff", "size": "512M", "state": "online", "removable": "yes", "block": "18-19", "node": "0"},
- {"range": "0x0000000140000000-0x000000017fffffff", "size": "1G", "state": "offline", "removable": "-", "block": "20-23", "node": "0"}
+ {"range":"0x0000000000000000-0x000000006fffffff", "size":"1.8G", "state":"online", "removable":"yes", "block":"0-6", "node":"0"},
+ {"range":"0x0000000070000000-0x000000007fffffff", "size":"256M", "state":"online", "removable":"no", "block":"7", "node":"0"},
+ {"range":"0x0000000080000000-0x000000009fffffff", "size":"512M", "state":"online", "removable":"yes", "block":"8-9", "node":"0"},
+ {"range":"0x00000000a0000000-0x00000000bfffffff", "size":"512M", "state":"online", "removable":"no", "block":"10-11", "node":"0"},
+ {"range":"0x00000000c0000000-0x00000000dfffffff", "size":"512M", "state":"online", "removable":"yes", "block":"12-13", "node":"0"},
+ {"range":"0x00000000e0000000-0x00000000efffffff", "size":"256M", "state":"offline", "removable":"-", "block":"14", "node":"0"},
+ {"range":"0x00000000f0000000-0x00000000ffffffff", "size":"256M", "state":"online", "removable":"yes", "block":"15", "node":"0"},
+ {"range":"0x0000000100000000-0x000000011fffffff", "size":"512M", "state":"online", "removable":"no", "block":"16-17", "node":"0"},
+ {"range":"0x0000000120000000-0x000000013fffffff", "size":"512M", "state":"online", "removable":"yes", "block":"18-19", "node":"0"},
+ {"range":"0x0000000140000000-0x000000017fffffff", "size":"1G", "state":"offline", "removable":"-", "block":"20-23", "node":"0"}
]
}
diff --git a/tests/expected/lsmem/lsmem-x86_64-16g b/tests/expected/lsmem/lsmem-x86_64-16g
index 7392ab77c..dd250235f 100644
--- a/tests/expected/lsmem/lsmem-x86_64-16g
+++ b/tests/expected/lsmem/lsmem-x86_64-16g
@@ -237,36 +237,36 @@ RANGE SIZE STATE REMOVABLE BLOCK NODE
$ lsmem --json --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
{
"memory": [
- {"range": "0x0000000000000000-0x0000000007ffffff", "size": "128M", "state": "online", "removable": "no", "block": "0", "node": "0"},
- {"range": "0x0000000008000000-0x0000000037ffffff", "size": "768M", "state": "online", "removable": "yes", "block": "1-6", "node": "0"},
- {"range": "0x0000000038000000-0x000000003fffffff", "size": "128M", "state": "online", "removable": "no", "block": "7", "node": "0"},
- {"range": "0x0000000040000000-0x0000000077ffffff", "size": "896M", "state": "online", "removable": "yes", "block": "8-14", "node": "0"},
- {"range": "0x0000000078000000-0x000000007fffffff", "size": "128M", "state": "online", "removable": "no", "block": "15", "node": "0"},
- {"range": "0x0000000080000000-0x00000000afffffff", "size": "768M", "state": "online", "removable": "yes", "block": "16-21", "node": "0"},
- {"range": "0x00000000b0000000-0x00000000bfffffff", "size": "256M", "state": "online", "removable": "no", "block": "22-23", "node": "0"},
- {"range": "0x0000000100000000-0x00000001a7ffffff", "size": "2.6G", "state": "online", "removable": "no", "block": "32-52", "node": "0"},
- {"range": "0x00000001a8000000-0x00000001afffffff", "size": "128M", "state": "online", "removable": "yes", "block": "53", "node": "0"},
- {"range": "0x00000001b0000000-0x00000001bfffffff", "size": "256M", "state": "online", "removable": "no", "block": "54-55", "node": "0"},
- {"range": "0x00000001c0000000-0x00000001ffffffff", "size": "1G", "state": "online", "removable": "yes", "block": "56-63", "node": "0"},
- {"range": "0x0000000200000000-0x0000000207ffffff", "size": "128M", "state": "online", "removable": "no", "block": "64", "node": "0"},
- {"range": "0x0000000208000000-0x000000021fffffff", "size": "384M", "state": "online", "removable": "yes", "block": "65-67", "node": "0"},
- {"range": "0x0000000220000000-0x0000000237ffffff", "size": "384M", "state": "online", "removable": "no", "block": "68-70", "node": "0"},
- {"range": "0x0000000238000000-0x0000000277ffffff", "size": "1G", "state": "online", "removable": "yes", "block": "71-78", "node": "0"},
- {"range": "0x0000000278000000-0x000000028fffffff", "size": "384M", "state": "online", "removable": "no", "block": "79-81", "node": "0"},
- {"range": "0x0000000290000000-0x0000000297ffffff", "size": "128M", "state": "online", "removable": "yes", "block": "82", "node": "0"},
- {"range": "0x0000000298000000-0x00000002a7ffffff", "size": "256M", "state": "online", "removable": "no", "block": "83-84", "node": "0"},
- {"range": "0x00000002a8000000-0x00000002c7ffffff", "size": "512M", "state": "online", "removable": "yes", "block": "85-88", "node": "0"},
- {"range": "0x00000002c8000000-0x00000002dfffffff", "size": "384M", "state": "online", "removable": "no", "block": "89-91", "node": "0"},
- {"range": "0x00000002e0000000-0x00000002efffffff", "size": "256M", "state": "online", "removable": "yes", "block": "92-93", "node": "0"},
- {"range": "0x00000002f0000000-0x000000034fffffff", "size": "1.5G", "state": "online", "removable": "no", "block": "94-105", "node": "0"},
- {"range": "0x0000000350000000-0x0000000357ffffff", "size": "128M", "state": "online", "removable": "yes", "block": "106", "node": "0"},
- {"range": "0x0000000358000000-0x000000036fffffff", "size": "384M", "state": "online", "removable": "no", "block": "107-109", "node": "0"},
- {"range": "0x0000000370000000-0x0000000377ffffff", "size": "128M", "state": "online", "removable": "yes", "block": "110", "node": "0"},
- {"range": "0x0000000378000000-0x00000003c7ffffff", "size": "1.3G", "state": "online", "removable": "no", "block": "111-120", "node": "0"},
- {"range": "0x00000003c8000000-0x00000003e7ffffff", "size": "512M", "state": "online", "removable": "yes", "block": "121-124", "node": "0"},
- {"range": "0x00000003e8000000-0x000000042fffffff", "size": "1.1G", "state": "online", "removable": "no", "block": "125-133", "node": "0"},
- {"range": "0x0000000430000000-0x0000000437ffffff", "size": "128M", "state": "online", "removable": "yes", "block": "134", "node": "0"},
- {"range": "0x0000000438000000-0x000000043fffffff", "size": "128M", "state": "online", "removable": "no", "block": "135", "node": "0"}
+ {"range":"0x0000000000000000-0x0000000007ffffff", "size":"128M", "state":"online", "removable":"no", "block":"0", "node":"0"},
+ {"range":"0x0000000008000000-0x0000000037ffffff", "size":"768M", "state":"online", "removable":"yes", "block":"1-6", "node":"0"},
+ {"range":"0x0000000038000000-0x000000003fffffff", "size":"128M", "state":"online", "removable":"no", "block":"7", "node":"0"},
+ {"range":"0x0000000040000000-0x0000000077ffffff", "size":"896M", "state":"online", "removable":"yes", "block":"8-14", "node":"0"},
+ {"range":"0x0000000078000000-0x000000007fffffff", "size":"128M", "state":"online", "removable":"no", "block":"15", "node":"0"},
+ {"range":"0x0000000080000000-0x00000000afffffff", "size":"768M", "state":"online", "removable":"yes", "block":"16-21", "node":"0"},
+ {"range":"0x00000000b0000000-0x00000000bfffffff", "size":"256M", "state":"online", "removable":"no", "block":"22-23", "node":"0"},
+ {"range":"0x0000000100000000-0x00000001a7ffffff", "size":"2.6G", "state":"online", "removable":"no", "block":"32-52", "node":"0"},
+ {"range":"0x00000001a8000000-0x00000001afffffff", "size":"128M", "state":"online", "removable":"yes", "block":"53", "node":"0"},
+ {"range":"0x00000001b0000000-0x00000001bfffffff", "size":"256M", "state":"online", "removable":"no", "block":"54-55", "node":"0"},
+ {"range":"0x00000001c0000000-0x00000001ffffffff", "size":"1G", "state":"online", "removable":"yes", "block":"56-63", "node":"0"},
+ {"range":"0x0000000200000000-0x0000000207ffffff", "size":"128M", "state":"online", "removable":"no", "block":"64", "node":"0"},
+ {"range":"0x0000000208000000-0x000000021fffffff", "size":"384M", "state":"online", "removable":"yes", "block":"65-67", "node":"0"},
+ {"range":"0x0000000220000000-0x0000000237ffffff", "size":"384M", "state":"online", "removable":"no", "block":"68-70", "node":"0"},
+ {"range":"0x0000000238000000-0x0000000277ffffff", "size":"1G", "state":"online", "removable":"yes", "block":"71-78", "node":"0"},
+ {"range":"0x0000000278000000-0x000000028fffffff", "size":"384M", "state":"online", "removable":"no", "block":"79-81", "node":"0"},
+ {"range":"0x0000000290000000-0x0000000297ffffff", "size":"128M", "state":"online", "removable":"yes", "block":"82", "node":"0"},
+ {"range":"0x0000000298000000-0x00000002a7ffffff", "size":"256M", "state":"online", "removable":"no", "block":"83-84", "node":"0"},
+ {"range":"0x00000002a8000000-0x00000002c7ffffff", "size":"512M", "state":"online", "removable":"yes", "block":"85-88", "node":"0"},
+ {"range":"0x00000002c8000000-0x00000002dfffffff", "size":"384M", "state":"online", "removable":"no", "block":"89-91", "node":"0"},
+ {"range":"0x00000002e0000000-0x00000002efffffff", "size":"256M", "state":"online", "removable":"yes", "block":"92-93", "node":"0"},
+ {"range":"0x00000002f0000000-0x000000034fffffff", "size":"1.5G", "state":"online", "removable":"no", "block":"94-105", "node":"0"},
+ {"range":"0x0000000350000000-0x0000000357ffffff", "size":"128M", "state":"online", "removable":"yes", "block":"106", "node":"0"},
+ {"range":"0x0000000358000000-0x000000036fffffff", "size":"384M", "state":"online", "removable":"no", "block":"107-109", "node":"0"},
+ {"range":"0x0000000370000000-0x0000000377ffffff", "size":"128M", "state":"online", "removable":"yes", "block":"110", "node":"0"},
+ {"range":"0x0000000378000000-0x00000003c7ffffff", "size":"1.3G", "state":"online", "removable":"no", "block":"111-120", "node":"0"},
+ {"range":"0x00000003c8000000-0x00000003e7ffffff", "size":"512M", "state":"online", "removable":"yes", "block":"121-124", "node":"0"},
+ {"range":"0x00000003e8000000-0x000000042fffffff", "size":"1.1G", "state":"online", "removable":"no", "block":"125-133", "node":"0"},
+ {"range":"0x0000000430000000-0x0000000437ffffff", "size":"128M", "state":"online", "removable":"yes", "block":"134", "node":"0"},
+ {"range":"0x0000000438000000-0x000000043fffffff", "size":"128M", "state":"online", "removable":"no", "block":"135", "node":"0"}
]
}
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-05-18 17:44:47 +0200