aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/qemu-iotests/03052
-rw-r--r--tests/qemu-iotests/030.out4
-rwxr-xr-xtests/qemu-iotests/0595
-rwxr-xr-x[-rw-r--r--]tests/qemu-iotests/0960
-rwxr-xr-x[-rw-r--r--]tests/qemu-iotests/1240
-rwxr-xr-x[-rw-r--r--]tests/qemu-iotests/1290
-rwxr-xr-x[-rw-r--r--]tests/qemu-iotests/1320
-rwxr-xr-x[-rw-r--r--]tests/qemu-iotests/1360
-rwxr-xr-x[-rw-r--r--]tests/qemu-iotests/1390
-rwxr-xr-x[-rw-r--r--]tests/qemu-iotests/1480
-rwxr-xr-x[-rw-r--r--]tests/qemu-iotests/1520
-rwxr-xr-xtests/qemu-iotests/1538
-rw-r--r--tests/qemu-iotests/153.out7
-rwxr-xr-x[-rw-r--r--]tests/qemu-iotests/1630
-rwxr-xr-xtests/qemu-iotests/20315
-rw-r--r--tests/qemu-iotests/203.out5
-rwxr-xr-x[-rw-r--r--]tests/qemu-iotests/2050
17 files changed, 72 insertions, 24 deletions
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index 457984b8e9..b5f88959aa 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -156,7 +156,7 @@ class TestSingleDrive(iotests.QMPTestCase):
class TestParallelOps(iotests.QMPTestCase):
num_ops = 4 # Number of parallel block-stream operations
num_imgs = num_ops * 2 + 1
- image_len = num_ops * 1024 * 1024
+ image_len = num_ops * 512 * 1024
imgs = []
def setUp(self):
@@ -176,14 +176,14 @@ class TestParallelOps(iotests.QMPTestCase):
'-o', 'backing_file=%s' % self.imgs[i-1], self.imgs[i])
# Put data into the images we are copying data from
- for i in range(self.num_imgs / 2):
- img_index = i * 2 + 1
- # Alternate between 512k and 1M.
+ odd_img_indexes = [x for x in reversed(range(self.num_imgs)) if x % 2 == 1]
+ for i in range(len(odd_img_indexes)):
+ # Alternate between 256KB and 512KB.
# This way jobs will not finish in the same order they were created
- num_kb = 512 + 512 * (i % 2)
+ num_kb = 256 + 256 * (i % 2)
qemu_io('-f', iotests.imgfmt,
- '-c', 'write -P %d %d %d' % (i, i*1024*1024, num_kb * 1024),
- self.imgs[img_index])
+ '-c', 'write -P 0xFF %dk %dk' % (i * 512, num_kb),
+ self.imgs[odd_img_indexes[i]])
# Attach the drive to the VM
self.vm = iotests.VM()
@@ -318,12 +318,14 @@ class TestParallelOps(iotests.QMPTestCase):
self.wait_until_completed(drive='commit-drive0')
# Test a block-stream and a block-commit job in parallel
- def test_stream_commit(self):
+ # Here the stream job is supposed to finish quickly in order to reproduce
+ # the scenario that triggers the bug fixed in 3d5d319e1221 and 1a63a907507
+ def test_stream_commit_1(self):
self.assertLessEqual(8, self.num_imgs)
self.assert_no_active_block_jobs()
# Stream from node0 into node2
- result = self.vm.qmp('block-stream', device='node2', job_id='node2')
+ result = self.vm.qmp('block-stream', device='node2', base_node='node0', job_id='node2')
self.assert_qmp(result, 'return', {})
# Commit from the active layer into node3
@@ -348,6 +350,38 @@ class TestParallelOps(iotests.QMPTestCase):
self.assert_no_active_block_jobs()
+ # This is similar to test_stream_commit_1 but both jobs are slowed
+ # down so they can run in parallel for a little while.
+ def test_stream_commit_2(self):
+ self.assertLessEqual(8, self.num_imgs)
+ self.assert_no_active_block_jobs()
+
+ # Stream from node0 into node4
+ result = self.vm.qmp('block-stream', device='node4', base_node='node0', job_id='node4', speed=1024*1024)
+ self.assert_qmp(result, 'return', {})
+
+ # Commit from the active layer into node5
+ result = self.vm.qmp('block-commit', device='drive0', base=self.imgs[5], speed=1024*1024)
+ self.assert_qmp(result, 'return', {})
+
+ # Wait for all jobs to be finished.
+ pending_jobs = ['node4', 'drive0']
+ while len(pending_jobs) > 0:
+ for event in self.vm.get_qmp_events(wait=True):
+ if event['event'] == 'BLOCK_JOB_COMPLETED':
+ node_name = self.dictpath(event, 'data/device')
+ self.assertTrue(node_name in pending_jobs)
+ self.assert_qmp_absent(event, 'data/error')
+ pending_jobs.remove(node_name)
+ if event['event'] == 'BLOCK_JOB_READY':
+ self.assert_qmp(event, 'data/device', 'drive0')
+ self.assert_qmp(event, 'data/type', 'commit')
+ self.assert_qmp_absent(event, 'data/error')
+ self.assertTrue('drive0' in pending_jobs)
+ self.vm.qmp('block-job-complete', device='drive0')
+
+ self.assert_no_active_block_jobs()
+
# Test the base_node parameter
def test_stream_base_node_name(self):
self.assert_no_active_block_jobs()
diff --git a/tests/qemu-iotests/030.out b/tests/qemu-iotests/030.out
index 391c8573ca..42314e9c00 100644
--- a/tests/qemu-iotests/030.out
+++ b/tests/qemu-iotests/030.out
@@ -1,5 +1,5 @@
-.......................
+........................
----------------------------------------------------------------------
-Ran 23 tests
+Ran 24 tests
OK
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index 40f89eae18..530bbbe6ce 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -152,9 +152,8 @@ done
echo
echo "=== Testing afl image with a very large capacity ==="
_use_sample_img afl9.vmdk.bz2
-# The sed makes this test pass on machines with little RAM
-# (and also with 32 bit builds)
-_img_info | sed -e 's/Cannot allocate memory/Invalid argument/'
+_img_info | grep -q 'Cannot allocate memory' && _notrun "Insufficent memory, skipped test"
+_img_info
_cleanup_test_img
# success, all done
diff --git a/tests/qemu-iotests/096 b/tests/qemu-iotests/096
index aeeb3753cf..aeeb3753cf 100644..100755
--- a/tests/qemu-iotests/096
+++ b/tests/qemu-iotests/096
diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
index 8e76e62f93..8e76e62f93 100644..100755
--- a/tests/qemu-iotests/124
+++ b/tests/qemu-iotests/124
diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129
index 9e87e1c8d9..9e87e1c8d9 100644..100755
--- a/tests/qemu-iotests/129
+++ b/tests/qemu-iotests/129
diff --git a/tests/qemu-iotests/132 b/tests/qemu-iotests/132
index f53ef6e391..f53ef6e391 100644..100755
--- a/tests/qemu-iotests/132
+++ b/tests/qemu-iotests/132
diff --git a/tests/qemu-iotests/136 b/tests/qemu-iotests/136
index 88b97ea7c6..88b97ea7c6 100644..100755
--- a/tests/qemu-iotests/136
+++ b/tests/qemu-iotests/136
diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
index cc7fe337f3..cc7fe337f3 100644..100755
--- a/tests/qemu-iotests/139
+++ b/tests/qemu-iotests/139
diff --git a/tests/qemu-iotests/148 b/tests/qemu-iotests/148
index e01b061fe7..e01b061fe7 100644..100755
--- a/tests/qemu-iotests/148
+++ b/tests/qemu-iotests/148
diff --git a/tests/qemu-iotests/152 b/tests/qemu-iotests/152
index fec546d033..fec546d033 100644..100755
--- a/tests/qemu-iotests/152
+++ b/tests/qemu-iotests/152
diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
index fa25eb24bd..adfd02695b 100755
--- a/tests/qemu-iotests/153
+++ b/tests/qemu-iotests/153
@@ -32,6 +32,7 @@ _cleanup()
{
_cleanup_test_img
rm -f "${TEST_IMG}.base"
+ rm -f "${TEST_IMG}.overlay"
rm -f "${TEST_IMG}.convert"
rm -f "${TEST_IMG}.a"
rm -f "${TEST_IMG}.b"
@@ -177,8 +178,6 @@ rm -f "${TEST_IMG}.lnk" &>/dev/null
ln -s ${TEST_IMG} "${TEST_IMG}.lnk" || echo "Failed to create link"
_run_qemu_with_images "${TEST_IMG}.lnk" "${TEST_IMG}"
-echo
-echo "== Closing an image should unlock it =="
_launch_qemu
_send_qemu_cmd $QEMU_HANDLE \
@@ -193,7 +192,10 @@ _send_qemu_cmd $QEMU_HANDLE \
_run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512'
-echo "Closing drive"
+echo "Creating overlay with qemu-img when the guest is running should be allowed"
+_run_cmd $QEMU_IMG create -f $IMGFMT -b "${TEST_IMG}" "${TEST_IMG}.overlay"
+
+echo "== Closing an image should unlock it =="
_send_qemu_cmd $QEMU_HANDLE \
"{ 'execute': 'human-monitor-command',
'arguments': { 'command-line': 'drive_del d0' } }" \
diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
index 5b917b177c..34309cfb20 100644
--- a/tests/qemu-iotests/153.out
+++ b/tests/qemu-iotests/153.out
@@ -372,15 +372,16 @@ Is another process using the image?
== Symbolic link ==
QEMU_PROG: -drive if=none,file=TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image?
-
-== Closing an image should unlock it ==
{"return": {}}
Adding drive
_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image?
-Closing drive
+Creating overlay with qemu-img when the guest is running should be allowed
+
+_qemu_img_wrapper create -f qcow2 -b TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.overlay
+== Closing an image should unlock it ==
_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
Adding two and closing one
diff --git a/tests/qemu-iotests/163 b/tests/qemu-iotests/163
index 403842354e..403842354e 100644..100755
--- a/tests/qemu-iotests/163
+++ b/tests/qemu-iotests/163
diff --git a/tests/qemu-iotests/203 b/tests/qemu-iotests/203
index 2c811917d8..4874a1a0d8 100755
--- a/tests/qemu-iotests/203
+++ b/tests/qemu-iotests/203
@@ -49,11 +49,18 @@ with iotests.FilePath('disk0.img') as disk0_img_path, \
node_name='drive1-node', iothread='iothread0',
force=True))
+ iotests.log('Enabling migration QMP events...')
+ iotests.log(vm.qmp('migrate-set-capabilities', capabilities=[
+ {
+ 'capability': 'events',
+ 'state': True
+ }
+ ]))
+
iotests.log('Starting migration...')
iotests.log(vm.qmp('migrate', uri='exec:cat >/dev/null'))
while True:
- vm.get_qmp_event(wait=60.0)
- result = vm.qmp('query-migrate')
- status = result.get('return', {}).get('status', None)
- if status == 'completed':
+ event = vm.event_wait('MIGRATION')
+ iotests.log(event, filters=[iotests.filter_qmp_event])
+ if event['data']['status'] == 'completed':
break
diff --git a/tests/qemu-iotests/203.out b/tests/qemu-iotests/203.out
index 3f1ff900e4..1a11f0975c 100644
--- a/tests/qemu-iotests/203.out
+++ b/tests/qemu-iotests/203.out
@@ -2,5 +2,10 @@ Launching VM...
Setting IOThreads...
{u'return': {}}
{u'return': {}}
+Enabling migration QMP events...
+{u'return': {}}
Starting migration...
{u'return': {}}
+{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'setup'}, u'event': u'MIGRATION'}
+{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'active'}, u'event': u'MIGRATION'}
+{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'completed'}, u'event': u'MIGRATION'}
diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205
index e7b2eae51d..e7b2eae51d 100644..100755
--- a/tests/qemu-iotests/205
+++ b/tests/qemu-iotests/205
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-29 22:57:19 +0000