Skip to contentSkip to conversation

tests/functional/s390x: Update expected virtio-pci IDs

PATCH In review Matthew Rosato 2 participants 2 messages Apr 24

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/functional/s390x: Update expected virtio-pci IDs

Now that legacy virtio-pci is disabled by default for s390x, adjust existing testcases to look for appropriate device IDs.

---
 tests/functional/s390x/test_ccw_virtio.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tests/functional/s390x/test_ccw_virtio.py +2 -2
index 0455337856..1d4958bbe2 100755
@@ -136,7 +136,7 @@ def test_s390x_devices(self):
                     r'0x1af4')
         exec_command_and_wait_for_pattern(self,
                     r'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_device',
-                    r'0x0001')
+                    r'0x1100')
         # check fid propagation
         exec_command_and_wait_for_pattern(self,
                     r'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
@@ -203,7 +203,7 @@ def test_s390x_fedora(self):
                         'while ! (dmesg | grep enP7p0s0) ; do sleep 1 ; done',
                         'virtio_net virtio0 enP7p0s0: renamed')
         exec_command_and_wait_for_pattern(self, 'lspci',
-                             '0007:00:00.0 Class 0200: Device 1af4:1000')
+                             '0007:00:00.0 Class 0200: Device 1af4:1041')
         exec_command_and_wait_for_pattern(self,
                              'cat /sys/class/net/enP7p0s0/address',
                              '02:ca:fe:fa:ce:12')
Signature · 1 line
2.53.0
#1 lore raw
Quoted 7 lines · Matthew Rosato

Now that legacy virtio-pci is disabled by default for s390x, adjust existing testcases to look for appropriate device IDs.

---
 tests/functional/s390x/test_ccw_virtio.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Thanks, queued to s390-next.