| Message ID | 20231116130022.1270356-1-marcandre.lureau@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | avocado: fix Python invalid escape sequence | expand |
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")?
Queued, thanks. Paolo
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',