* [PATCH] avocado: fix Python invalid escape sequence
@ 2023-11-16 13:00 marcandre.lureau
2023-11-16 13:12 ` Philippe Mathieu-Daudé
2023-11-21 15:50 ` Paolo Bonzini
0 siblings, 2 replies; 3+ messages in thread
From: marcandre.lureau @ 2023-11-16 13:00 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, qemu-stable, Halil Pasic,
Christian Borntraeger, Eric Farman, Cleber Rosa,
Philippe Mathieu-Daudé, Wainer dos Santos Moschetta,
Beraldo Leal, open list:S390 Virtio-ccw
From: Marc-André Lureau <marcandre.lureau@redhat.com>
This is an error in Python 3.12; fix it by using a raw string literal.
Cc: qemu-stable@nongnu.org
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/avocado/machine_s390_ccw_virtio.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/avocado/machine_s390_ccw_virtio.py b/tests/avocado/machine_s390_ccw_virtio.py
index e1f493bc44..74a52c506d 100644
--- a/tests/avocado/machine_s390_ccw_virtio.py
+++ b/tests/avocado/machine_s390_ccw_virtio.py
@@ -36,7 +36,7 @@ def wait_for_crw_reports(self):
dmesg_clear_count = 1
def clear_guest_dmesg(self):
exec_command_and_wait_for_pattern(self, 'dmesg -c > /dev/null; '
- 'echo dm_clear\ ' + str(self.dmesg_clear_count),
+ r'echo dm_clear\ ' + str(self.dmesg_clear_count),
'dm_clear ' + str(self.dmesg_clear_count))
self.dmesg_clear_count += 1
@@ -121,14 +121,14 @@ def test_s390x_devices(self):
'cat /sys/bus/ccw/devices/0.1.1111/cutype',
'3832/01')
exec_command_and_wait_for_pattern(self,
- 'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_vendor',
+ r'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_vendor',
'0x1af4')
exec_command_and_wait_for_pattern(self,
- 'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_device',
+ r'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_device',
'0x0001')
# check fid propagation
exec_command_and_wait_for_pattern(self,
- 'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
+ r'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
'0x0000000c')
# add another device
self.clear_guest_dmesg()
@@ -235,7 +235,7 @@ def test_s390x_fedora(self):
'while ! (dmesg | grep gpudrmfb) ; do sleep 1 ; done',
'virtio_gpudrmfb frame buffer device')
exec_command_and_wait_for_pattern(self,
- 'echo -e "\e[?25l" > /dev/tty0', ':/#')
+ r'echo -e "\e[?25l" > /dev/tty0', ':/#')
exec_command_and_wait_for_pattern(self, 'for ((i=0;i<250;i++)); do '
'echo " The qu ick fo x j ump s o ver a laz y d og" >> fox.txt;'
'done',
--
2.41.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] avocado: fix Python invalid escape sequence
2023-11-16 13:00 [PATCH] avocado: fix Python invalid escape sequence marcandre.lureau
@ 2023-11-16 13:12 ` Philippe Mathieu-Daudé
2023-11-21 15:50 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-11-16 13:12 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel
Cc: qemu-stable, Halil Pasic, Christian Borntraeger, Eric Farman,
Cleber Rosa, Wainer dos Santos Moschetta, Beraldo Leal,
open list:S390 Virtio-ccw
Hi Marc-André,
On 16/11/23 14:00, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> This is an error in Python 3.12; fix it by using a raw string literal.
>
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> tests/avocado/machine_s390_ccw_virtio.py | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tests/avocado/machine_s390_ccw_virtio.py b/tests/avocado/machine_s390_ccw_virtio.py
> index e1f493bc44..74a52c506d 100644
> --- a/tests/avocado/machine_s390_ccw_virtio.py
> +++ b/tests/avocado/machine_s390_ccw_virtio.py
> @@ -36,7 +36,7 @@ def wait_for_crw_reports(self):
> dmesg_clear_count = 1
> def clear_guest_dmesg(self):
> exec_command_and_wait_for_pattern(self, 'dmesg -c > /dev/null; '
> - 'echo dm_clear\ ' + str(self.dmesg_clear_count),
> + r'echo dm_clear\ ' + str(self.dmesg_clear_count),
> 'dm_clear ' + str(self.dmesg_clear_count))
> self.dmesg_clear_count += 1
>
> @@ -121,14 +121,14 @@ def test_s390x_devices(self):
> 'cat /sys/bus/ccw/devices/0.1.1111/cutype',
> '3832/01')
> exec_command_and_wait_for_pattern(self,
> - 'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_vendor',
> + r'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_vendor',
> '0x1af4')
> exec_command_and_wait_for_pattern(self,
> - 'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_device',
> + r'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_device',
> '0x0001')
> # check fid propagation
> exec_command_and_wait_for_pattern(self,
> - 'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
> + r'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
> '0x0000000c')
> # add another device
> self.clear_guest_dmesg()
> @@ -235,7 +235,7 @@ def test_s390x_fedora(self):
> 'while ! (dmesg | grep gpudrmfb) ; do sleep 1 ; done',
> 'virtio_gpudrmfb frame buffer device')
> exec_command_and_wait_for_pattern(self,
> - 'echo -e "\e[?25l" > /dev/tty0', ':/#')
> + r'echo -e "\e[?25l" > /dev/tty0', ':/#')
> exec_command_and_wait_for_pattern(self, 'for ((i=0;i<250;i++)); do '
> 'echo " The qu ick fo x j ump s o ver a laz y d og" >> fox.txt;'
> 'done',
Isn't it commit 0b2af475e9 ("tests/avocado/machine_s390_ccw_virtio.py:
Fix SyntaxWarnings from python 3.12")?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] avocado: fix Python invalid escape sequence
2023-11-16 13:00 [PATCH] avocado: fix Python invalid escape sequence marcandre.lureau
2023-11-16 13:12 ` Philippe Mathieu-Daudé
@ 2023-11-21 15:50 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2023-11-21 15:50 UTC (permalink / raw)
To: marcandre.lureau
Cc: qemu-devel, Markus Armbruster, Peter Xu,
Philippe Mathieu-Daudé, David Hildenbrand, qemu-stable,
Halil Pasic, Christian Borntraeger, Eric Farman, Cleber Rosa,
Wainer dos Santos Moschetta, Beraldo Leal,
open list : S390 Virtio-ccw
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-11-21 15:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-16 13:00 [PATCH] avocado: fix Python invalid escape sequence marcandre.lureau
2023-11-16 13:12 ` Philippe Mathieu-Daudé
2023-11-21 15:50 ` Paolo Bonzini
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).