* [PATCH] iotests/118: Drop 'change' test
@ 2021-01-26 10:48 Max Reitz
2021-01-26 10:57 ` Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Max Reitz @ 2021-01-26 10:48 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, Paolo Bonzini, qemu-devel, Max Reitz
Commit 0afec75734331 removed the 'change' QMP command, so we can no
longer test it in 118.
Fixes: 0afec75734331a0b52fa3aa4235220eda8c7846f
('qmp: remove deprecated "change" command')
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/118 | 17 -----------------
tests/qemu-iotests/118.out | 4 ++--
2 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
index 1a2e219057..88e8354e21 100755
--- a/tests/qemu-iotests/118
+++ b/tests/qemu-iotests/118
@@ -74,23 +74,6 @@ class ChangeBaseClass(iotests.QMPTestCase):
class GeneralChangeTestsBaseClass(ChangeBaseClass):
- def test_change(self):
- # 'change' requires a drive name, so skip the test for blockdev
- if not self.use_drive:
- return
-
- result = self.vm.qmp('change', device='drive0', target=new_img,
- arg=iotests.imgfmt)
- self.assert_qmp(result, 'return', {})
-
- self.wait_for_open()
- self.wait_for_close()
-
- result = self.vm.qmp('query-block')
- if self.has_real_tray:
- self.assert_qmp(result, 'return[0]/tray_open', False)
- self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
-
def test_blockdev_change_medium(self):
result = self.vm.qmp('blockdev-change-medium',
id=self.device_name, filename=new_img,
diff --git a/tests/qemu-iotests/118.out b/tests/qemu-iotests/118.out
index bf5bfd5aca..0a70391105 100644
--- a/tests/qemu-iotests/118.out
+++ b/tests/qemu-iotests/118.out
@@ -1,5 +1,5 @@
-.......................................................................................................................................................................
+...........................................................................................................................................................
----------------------------------------------------------------------
-Ran 167 tests
+Ran 155 tests
OK
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] iotests/118: Drop 'change' test
2021-01-26 10:48 [PATCH] iotests/118: Drop 'change' test Max Reitz
@ 2021-01-26 10:57 ` Philippe Mathieu-Daudé
2021-01-26 11:18 ` Kevin Wolf
2021-01-26 11:30 ` Paolo Bonzini
2 siblings, 0 replies; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-26 10:57 UTC (permalink / raw)
To: Max Reitz, qemu-block
Cc: Kevin Wolf, Paolo Bonzini, qemu-devel, Gerd Hoffmann
On 1/26/21 11:48 AM, Max Reitz wrote:
> Commit 0afec75734331 removed the 'change' QMP command, so we can no
> longer test it in 118.
>
> Fixes: 0afec75734331a0b52fa3aa4235220eda8c7846f
> ('qmp: remove deprecated "change" command')
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/118 | 17 -----------------
> tests/qemu-iotests/118.out | 4 ++--
> 2 files changed, 2 insertions(+), 19 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iotests/118: Drop 'change' test
2021-01-26 10:48 [PATCH] iotests/118: Drop 'change' test Max Reitz
2021-01-26 10:57 ` Philippe Mathieu-Daudé
@ 2021-01-26 11:18 ` Kevin Wolf
2021-01-26 12:21 ` Max Reitz
2021-01-26 11:30 ` Paolo Bonzini
2 siblings, 1 reply; 6+ messages in thread
From: Kevin Wolf @ 2021-01-26 11:18 UTC (permalink / raw)
To: Max Reitz; +Cc: Paolo Bonzini, qemu-devel, qemu-block
Am 26.01.2021 um 11:48 hat Max Reitz geschrieben:
> Commit 0afec75734331 removed the 'change' QMP command, so we can no
> longer test it in 118.
>
> Fixes: 0afec75734331a0b52fa3aa4235220eda8c7846f
> ('qmp: remove deprecated "change" command')
> Signed-off-by: Max Reitz <mreitz@redhat.com>
Thanks, applied to the block branch.
(I was just about to make the same change myself...)
If you don't mind, I'd squash in something like the following.
Kevin
diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
index 88e8354e21..cae52ffa5e 100755
--- a/tests/qemu-iotests/118
+++ b/tests/qemu-iotests/118
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
# group: rw
#
-# Test case for the QMP 'change' command and all other associated
-# commands
+# Test case for media change monitor commands
#
# Copyright (C) 2015 Red Hat, Inc.
#
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] iotests/118: Drop 'change' test
2021-01-26 10:48 [PATCH] iotests/118: Drop 'change' test Max Reitz
2021-01-26 10:57 ` Philippe Mathieu-Daudé
2021-01-26 11:18 ` Kevin Wolf
@ 2021-01-26 11:30 ` Paolo Bonzini
2021-01-26 12:28 ` Kevin Wolf
2 siblings, 1 reply; 6+ messages in thread
From: Paolo Bonzini @ 2021-01-26 11:30 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On 26/01/21 11:48, Max Reitz wrote:
> Commit 0afec75734331 removed the 'change' QMP command, so we can no
> longer test it in 118.
>
> Fixes: 0afec75734331a0b52fa3aa4235220eda8c7846f
> ('qmp: remove deprecated "change" command')
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/118 | 17 -----------------
> tests/qemu-iotests/118.out | 4 ++--
> 2 files changed, 2 insertions(+), 19 deletions(-)
How come this didn't break GitLab CI?...
Paolo
> diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
> index 1a2e219057..88e8354e21 100755
> --- a/tests/qemu-iotests/118
> +++ b/tests/qemu-iotests/118
> @@ -74,23 +74,6 @@ class ChangeBaseClass(iotests.QMPTestCase):
>
> class GeneralChangeTestsBaseClass(ChangeBaseClass):
>
> - def test_change(self):
> - # 'change' requires a drive name, so skip the test for blockdev
> - if not self.use_drive:
> - return
> -
> - result = self.vm.qmp('change', device='drive0', target=new_img,
> - arg=iotests.imgfmt)
> - self.assert_qmp(result, 'return', {})
> -
> - self.wait_for_open()
> - self.wait_for_close()
> -
> - result = self.vm.qmp('query-block')
> - if self.has_real_tray:
> - self.assert_qmp(result, 'return[0]/tray_open', False)
> - self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
> -
> def test_blockdev_change_medium(self):
> result = self.vm.qmp('blockdev-change-medium',
> id=self.device_name, filename=new_img,
> diff --git a/tests/qemu-iotests/118.out b/tests/qemu-iotests/118.out
> index bf5bfd5aca..0a70391105 100644
> --- a/tests/qemu-iotests/118.out
> +++ b/tests/qemu-iotests/118.out
> @@ -1,5 +1,5 @@
> -.......................................................................................................................................................................
> +...........................................................................................................................................................
> ----------------------------------------------------------------------
> -Ran 167 tests
> +Ran 155 tests
>
> OK
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iotests/118: Drop 'change' test
2021-01-26 11:18 ` Kevin Wolf
@ 2021-01-26 12:21 ` Max Reitz
0 siblings, 0 replies; 6+ messages in thread
From: Max Reitz @ 2021-01-26 12:21 UTC (permalink / raw)
To: Kevin Wolf; +Cc: Paolo Bonzini, qemu-devel, qemu-block
On 26.01.21 12:18, Kevin Wolf wrote:
> Am 26.01.2021 um 11:48 hat Max Reitz geschrieben:
>> Commit 0afec75734331 removed the 'change' QMP command, so we can no
>> longer test it in 118.
>>
>> Fixes: 0afec75734331a0b52fa3aa4235220eda8c7846f
>> ('qmp: remove deprecated "change" command')
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>
> Thanks, applied to the block branch.
>
> (I was just about to make the same change myself...)
>
> If you don't mind, I'd squash in something like the following.
>
> Kevin
>
> diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
> index 88e8354e21..cae52ffa5e 100755
> --- a/tests/qemu-iotests/118
> +++ b/tests/qemu-iotests/118
> @@ -1,8 +1,7 @@
> #!/usr/bin/env python3
> # group: rw
> #
> -# Test case for the QMP 'change' command and all other associated
> -# commands
> +# Test case for media change monitor commands
> #
> # Copyright (C) 2015 Red Hat, Inc.
> #
Sure, looks good.
Do you plan on sending a pull request today? I was, and so I’d like to
include this patch then.
(Well, I was planning to send it last week, then came the
coroutine-sigaltstack stuff, then this, and right now I’m debugging 178
breaking after ccd3b3b8112b670fdccf8a392b8419b173ffccb4...)
Max
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iotests/118: Drop 'change' test
2021-01-26 11:30 ` Paolo Bonzini
@ 2021-01-26 12:28 ` Kevin Wolf
0 siblings, 0 replies; 6+ messages in thread
From: Kevin Wolf @ 2021-01-26 12:28 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, qemu-block, Max Reitz
Am 26.01.2021 um 12:30 hat Paolo Bonzini geschrieben:
> On 26/01/21 11:48, Max Reitz wrote:
> > Commit 0afec75734331 removed the 'change' QMP command, so we can no
> > longer test it in 118.
> >
> > Fixes: 0afec75734331a0b52fa3aa4235220eda8c7846f
> > ('qmp: remove deprecated "change" command')
> > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > ---
> > tests/qemu-iotests/118 | 17 -----------------
> > tests/qemu-iotests/118.out | 4 ++--
> > 2 files changed, 2 insertions(+), 19 deletions(-)
>
> How come this didn't break GitLab CI?...
The test case is not in the auto group.
Kevin
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-01-26 12:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-26 10:48 [PATCH] iotests/118: Drop 'change' test Max Reitz
2021-01-26 10:57 ` Philippe Mathieu-Daudé
2021-01-26 11:18 ` Kevin Wolf
2021-01-26 12:21 ` Max Reitz
2021-01-26 11:30 ` Paolo Bonzini
2021-01-26 12:28 ` Kevin Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).