Re: [PATCH] tests/avocado/machine_s390_ccw_virtio.py: Fix SyntaxWarnings from python 3.12

[Philippe Mathieu-Daudé]

On 13/11/23 15:07, Thomas Huth wrote:

Python 3.12 now warns about backslashes in strings that aren't used
for escaping a special character from Python. Silence the warning
by using raw strings here instead.

Signed-off-by: Thomas Huth <th...@redhat.com>
---
  tests/avocado/machine_s390_ccw_virtio.py | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/avocado/machine_s390_ccw_virtio.py 
b/tests/avocado/machine_s390_ccw_virtio.py
index e1f493bc44..ffd914ded9 100644
--- a/tests/avocado/machine_s390_ccw_virtio.py
+++ b/tests/avocado/machine_s390_ccw_virtio.py
@@ -36,8 +36,8 @@ 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),
-                    'dm_clear ' + str(self.dmesg_clear_count))
+                    r'echo dm_clear\ ' + str(self.dmesg_clear_count),
+                    r'dm_clear ' + str(self.dmesg_clear_count))
          self.dmesg_clear_count += 1

def test_s390x_devices(self):

@@ -121,15 +121,15 @@ 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',
-                    '0x1af4')
+                    r'cat 
/sys/bus/pci/devices/0005\:00\:00.0/subsystem_vendor',
+                    r'0x1af4')

Do we really need to escape the hex number?

          exec_command_and_wait_for_pattern(self,
-                    'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_device',
-                    '0x0001')
+                    r'cat 
/sys/bus/pci/devices/0005\:00\:00.0/subsystem_device',
+                    r'0x0001')

Ditto,

          # check fid propagation
          exec_command_and_wait_for_pattern(self,
-                        'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
-                        '0x0000000c')
+                    r'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
+                    r'0x0000000c')

Ditto.

Otherwise,
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>

          # add another device
          self.clear_guest_dmesg()
          self.vm.cmd('device_add', driver='virtio-net-ccw',
@@ -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',