diff options
author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2020-12-16 12:52:05 +0300 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2020-12-18 11:48:39 +0100 |
commit | 1a35110150e38beea15865f886022fe329028e12 (patch) | |
tree | 201f1699e7bf25bf9b9bda950e50739585c19224 /tests | |
parent | 7ba9646c6044afc715212981b8747e0418198c1d (diff) |
iotests:172: use _filter_qom_path
device[NUMBER] thing in QOM path is not stable and tracking it during
code modifications is not fun. Let's filter it like it's already done
in iotest 186.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20201216095205.526235-3-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/qemu-iotests/172 | 2 | ||||
-rw-r--r-- | tests/qemu-iotests/172.out | 152 |
2 files changed, 77 insertions, 77 deletions
diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index 3abfa72948..b45782e8db 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -73,7 +73,7 @@ check_floppy_qtree() (QEMU_OPTIONS="" do_run_qemu "$@" | _filter_testdir |_filter_generated_node_ids | _filter_hmp | sed -ne '/^ dev: isa-fdc/,/^ dev:/{x;p};/^[a-z][^ ]* (NODE_NAME):* /,/^(qemu)$/{p}') 2>&1 | - _filter_win32 | _filter_qemu + _filter_win32 | _filter_qemu | _filter_qom_path } check_cache_mode() diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out index cca2894af0..2cd4a8fd83 100644 --- a/tests/qemu-iotests/172.out +++ b/tests/qemu-iotests/172.out @@ -63,12 +63,12 @@ Testing: -fda TEST_DIR/t.qcow2 share-rw = false drive-type = "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -114,16 +114,16 @@ Testing: -fdb TEST_DIR/t.qcow2 share-rw = false drive-type = "288" floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[16] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[23] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed floppy0: [not inserted] - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -169,17 +169,17 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2 share-rw = false drive-type = "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback floppy1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/unattached/device[16] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[23] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -255,12 +255,12 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 share-rw = false drive-type = "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -306,16 +306,16 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1 share-rw = false drive-type = "288" floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[16] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[23] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed floppy0: [not inserted] - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -361,17 +361,17 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t share-rw = false drive-type = "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback floppy1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/unattached/device[16] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[23] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -411,12 +411,12 @@ Use -device floppy,unit=0,drive=... instead. share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -453,12 +453,12 @@ Use -device floppy,unit=1,drive=... instead. share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -508,17 +508,17 @@ Use -device floppy,unit=1,drive=... instead. share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/unattached/device[16] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[23] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -556,12 +556,12 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0 share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[21] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -596,12 +596,12 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,unit=1 share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[21] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -647,17 +647,17 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[1] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[21] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -708,17 +708,17 @@ Use -device floppy,unit=1,drive=... instead. share-rw = false drive-type = "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[16] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[23] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -766,17 +766,17 @@ Use -device floppy,unit=0,drive=... instead. share-rw = false drive-type = "144" floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[16] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[23] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -838,17 +838,17 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl share-rw = false drive-type = "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -894,17 +894,17 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl share-rw = false drive-type = "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -950,17 +950,17 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl share-rw = false drive-type = "144" floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -1006,17 +1006,17 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl share-rw = false drive-type = "144" floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -1071,17 +1071,17 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q share-rw = false drive-type = "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -1127,17 +1127,17 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q share-rw = false drive-type = "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -1191,17 +1191,17 @@ Use -device floppy,unit=0,drive=... instead. share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -1249,17 +1249,17 @@ Use -device floppy,unit=0,drive=... instead. share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -1307,17 +1307,17 @@ Use -device floppy,unit=1,drive=... instead. share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -1365,17 +1365,17 @@ Use -device floppy,unit=1,drive=... instead. share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/unattached/device[15] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed Cache mode: writeback none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[22] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -1410,12 +1410,12 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global floppy.drive=none0 -device share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[21] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -1603,12 +1603,12 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t share-rw = false drive-type = "120" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[21] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -1643,12 +1643,12 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t share-rw = false drive-type = "288" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[21] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -1686,12 +1686,12 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,logical share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[21] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] @@ -1726,12 +1726,12 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physica share-rw = false drive-type = "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) - Attached to: /machine/peripheral-anon/device[0] + Attached to: /machine/peripheral-anon/device[N] Removable device: not locked, tray closed Cache mode: writeback ide1-cd0: [not inserted] - Attached to: /machine/unattached/device[21] + Attached to: /machine/unattached/device[N] Removable device: not locked, tray closed sd0: [not inserted] |