tests/functional: Remove semicolons at the end of lines

Yes, we are all C coders who try to write Python code for testing...
but still, let's better avoid semicolons at the end of the lines
to keep "pylint" happy!

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Message-ID: <20250327201305.996241-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2025-03-27 21:13:05 +01:00
parent 52e9ed6d3a
commit 858640eaee
12 changed files with 40 additions and 40 deletions

View file

@ -44,7 +44,7 @@ class AspeedTest(LinuxKernelTest):
def do_test_arm_aspeed_buildroot_poweroff(self): def do_test_arm_aspeed_buildroot_poweroff(self):
exec_command_and_wait_for_pattern(self, 'poweroff', exec_command_and_wait_for_pattern(self, 'poweroff',
'System halted'); 'System halted')
def do_test_arm_aspeed_sdk_start(self, image): def do_test_arm_aspeed_sdk_start(self, image):
self.require_netdev('user') self.require_netdev('user')

View file

@ -85,7 +85,7 @@ class AST2x00MachineSDK(QemuSystemTest):
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'echo lm75 0x4d > /sys/class/i2c-dev/i2c-1/device/new_device ', 'echo lm75 0x4d > /sys/class/i2c-dev/i2c-1/device/new_device ',
'i2c i2c-1: new_device: Instantiated device lm75 at 0x4d'); 'i2c i2c-1: new_device: Instantiated device lm75 at 0x4d')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'cat /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input', '0') 'cat /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input', '0')
self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test', self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',

View file

@ -22,17 +22,17 @@ class AST2500Machine(AspeedTest):
image_path = self.ASSET_BR2_202411_AST2500_FLASH.fetch() image_path = self.ASSET_BR2_202411_AST2500_FLASH.fetch()
self.vm.add_args('-device', self.vm.add_args('-device',
'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test'); 'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test')
self.do_test_arm_aspeed_buildroot_start(image_path, '0x0', self.do_test_arm_aspeed_buildroot_start(image_path, '0x0',
'ast2500-evb login:') 'ast2500-evb login:')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'echo lm75 0x4d > /sys/class/i2c-dev/i2c-3/device/new_device', 'echo lm75 0x4d > /sys/class/i2c-dev/i2c-3/device/new_device',
'i2c i2c-3: new_device: Instantiated device lm75 at 0x4d'); 'i2c i2c-3: new_device: Instantiated device lm75 at 0x4d')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'cat /sys/class/hwmon/hwmon1/temp1_input', '0') 'cat /sys/class/hwmon/hwmon1/temp1_input', '0')
self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test', self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
property='temperature', value=18000); property='temperature', value=18000)
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'cat /sys/class/hwmon/hwmon1/temp1_input', '18000') 'cat /sys/class/hwmon/hwmon1/temp1_input', '18000')

View file

@ -27,38 +27,38 @@ class AST2600Machine(AspeedTest):
image_path = self.ASSET_BR2_202411_AST2600_FLASH.fetch() image_path = self.ASSET_BR2_202411_AST2600_FLASH.fetch()
self.vm.add_args('-device', self.vm.add_args('-device',
'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test'); 'tmp105,bus=aspeed.i2c.bus.3,address=0x4d,id=tmp-test')
self.vm.add_args('-device', self.vm.add_args('-device',
'ds1338,bus=aspeed.i2c.bus.3,address=0x32'); 'ds1338,bus=aspeed.i2c.bus.3,address=0x32')
self.vm.add_args('-device', self.vm.add_args('-device',
'i2c-echo,bus=aspeed.i2c.bus.3,address=0x42'); 'i2c-echo,bus=aspeed.i2c.bus.3,address=0x42')
self.do_test_arm_aspeed_buildroot_start(image_path, '0xf00', self.do_test_arm_aspeed_buildroot_start(image_path, '0xf00',
'ast2600-evb login:') 'ast2600-evb login:')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'echo lm75 0x4d > /sys/class/i2c-dev/i2c-3/device/new_device', 'echo lm75 0x4d > /sys/class/i2c-dev/i2c-3/device/new_device',
'i2c i2c-3: new_device: Instantiated device lm75 at 0x4d'); 'i2c i2c-3: new_device: Instantiated device lm75 at 0x4d')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'cat /sys/class/hwmon/hwmon1/temp1_input', '0') 'cat /sys/class/hwmon/hwmon1/temp1_input', '0')
self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test', self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
property='temperature', value=18000); property='temperature', value=18000)
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'cat /sys/class/hwmon/hwmon1/temp1_input', '18000') 'cat /sys/class/hwmon/hwmon1/temp1_input', '18000')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'echo ds1307 0x32 > /sys/class/i2c-dev/i2c-3/device/new_device', 'echo ds1307 0x32 > /sys/class/i2c-dev/i2c-3/device/new_device',
'i2c i2c-3: new_device: Instantiated device ds1307 at 0x32'); 'i2c i2c-3: new_device: Instantiated device ds1307 at 0x32')
year = time.strftime("%Y") year = time.strftime("%Y")
exec_command_and_wait_for_pattern(self, 'hwclock -f /dev/rtc1', year); exec_command_and_wait_for_pattern(self, 'hwclock -f /dev/rtc1', year)
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'echo slave-24c02 0x1064 > /sys/bus/i2c/devices/i2c-3/new_device', 'echo slave-24c02 0x1064 > /sys/bus/i2c/devices/i2c-3/new_device',
'i2c i2c-3: new_device: Instantiated device slave-24c02 at 0x64'); 'i2c i2c-3: new_device: Instantiated device slave-24c02 at 0x64')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'i2cset -y 3 0x42 0x64 0x00 0xaa i', '#'); 'i2cset -y 3 0x42 0x64 0x00 0xaa i', '#')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'hexdump /sys/bus/i2c/devices/3-1064/slave-eeprom', 'hexdump /sys/bus/i2c/devices/3-1064/slave-eeprom',
'0000000 ffaa ffff ffff ffff ffff ffff ffff ffff'); '0000000 ffaa ffff ffff ffff ffff ffff ffff ffff')
self.do_test_arm_aspeed_buildroot_poweroff() self.do_test_arm_aspeed_buildroot_poweroff()
ASSET_BR2_202302_AST2600_TPM_FLASH = Asset( ASSET_BR2_202302_AST2600_TPM_FLASH = Asset(
@ -90,10 +90,10 @@ class AST2600Machine(AspeedTest):
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'echo tpm_tis_i2c 0x2e > /sys/bus/i2c/devices/i2c-12/new_device', 'echo tpm_tis_i2c 0x2e > /sys/bus/i2c/devices/i2c-12/new_device',
'tpm_tis_i2c 12-002e: 2.0 TPM (device-id 0x1, rev-id 1)'); 'tpm_tis_i2c 12-002e: 2.0 TPM (device-id 0x1, rev-id 1)')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'cat /sys/class/tpm/tpm0/pcr-sha256/0', 'cat /sys/class/tpm/tpm0/pcr-sha256/0',
'B804724EA13F52A9072BA87FE8FDCC497DFC9DF9AA15B9088694639C431688E0'); 'B804724EA13F52A9072BA87FE8FDCC497DFC9DF9AA15B9088694639C431688E0')
self.do_test_arm_aspeed_buildroot_poweroff() self.do_test_arm_aspeed_buildroot_poweroff()
@ -107,9 +107,9 @@ class AST2600Machine(AspeedTest):
self.archive_extract(self.ASSET_SDK_V806_AST2600_A2) self.archive_extract(self.ASSET_SDK_V806_AST2600_A2)
self.vm.add_args('-device', self.vm.add_args('-device',
'tmp105,bus=aspeed.i2c.bus.5,address=0x4d,id=tmp-test'); 'tmp105,bus=aspeed.i2c.bus.5,address=0x4d,id=tmp-test')
self.vm.add_args('-device', self.vm.add_args('-device',
'ds1338,bus=aspeed.i2c.bus.5,address=0x32'); 'ds1338,bus=aspeed.i2c.bus.5,address=0x32')
self.do_test_arm_aspeed_sdk_start( self.do_test_arm_aspeed_sdk_start(
self.scratch_file("ast2600-a2", "image-bmc")) self.scratch_file("ast2600-a2", "image-bmc"))
@ -120,20 +120,20 @@ class AST2600Machine(AspeedTest):
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'echo lm75 0x4d > /sys/class/i2c-dev/i2c-5/device/new_device', 'echo lm75 0x4d > /sys/class/i2c-dev/i2c-5/device/new_device',
'i2c i2c-5: new_device: Instantiated device lm75 at 0x4d'); 'i2c i2c-5: new_device: Instantiated device lm75 at 0x4d')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'cat /sys/class/hwmon/hwmon19/temp1_input', '0') 'cat /sys/class/hwmon/hwmon19/temp1_input', '0')
self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test', self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
property='temperature', value=18000); property='temperature', value=18000)
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'cat /sys/class/hwmon/hwmon19/temp1_input', '18000') 'cat /sys/class/hwmon/hwmon19/temp1_input', '18000')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'echo ds1307 0x32 > /sys/class/i2c-dev/i2c-5/device/new_device', 'echo ds1307 0x32 > /sys/class/i2c-dev/i2c-5/device/new_device',
'i2c i2c-5: new_device: Instantiated device ds1307 at 0x32'); 'i2c i2c-5: new_device: Instantiated device ds1307 at 0x32')
year = time.strftime("%Y") year = time.strftime("%Y")
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'/sbin/hwclock -f /dev/rtc1', year); '/sbin/hwclock -f /dev/rtc1', year)
if __name__ == '__main__': if __name__ == '__main__':
AspeedTest.main() AspeedTest.main()

View file

@ -12,14 +12,14 @@ class BletchleyMachine(AspeedTest):
ASSET_BLETCHLEY_FLASH = Asset( ASSET_BLETCHLEY_FLASH = Asset(
'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/bletchley-bmc/openbmc-20250128071329/obmc-phosphor-image-bletchley-20250128071329.static.mtd.xz', 'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/bletchley-bmc/openbmc-20250128071329/obmc-phosphor-image-bletchley-20250128071329.static.mtd.xz',
'db21d04d47d7bb2a276f59d308614b4dfb70b9c7c81facbbca40a3977a2d8844'); 'db21d04d47d7bb2a276f59d308614b4dfb70b9c7c81facbbca40a3977a2d8844')
def test_arm_ast2600_bletchley_openbmc(self): def test_arm_ast2600_bletchley_openbmc(self):
image_path = self.uncompress(self.ASSET_BLETCHLEY_FLASH) image_path = self.uncompress(self.ASSET_BLETCHLEY_FLASH)
self.do_test_arm_aspeed_openbmc('bletchley-bmc', image=image_path, self.do_test_arm_aspeed_openbmc('bletchley-bmc', image=image_path,
uboot='2019.04', cpu_id='0xf00', uboot='2019.04', cpu_id='0xf00',
soc='AST2600 rev A3'); soc='AST2600 rev A3')
if __name__ == '__main__': if __name__ == '__main__':
AspeedTest.main() AspeedTest.main()

View file

@ -12,14 +12,14 @@ class PalmettoMachine(AspeedTest):
ASSET_PALMETTO_FLASH = Asset( ASSET_PALMETTO_FLASH = Asset(
'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/palmetto-bmc/openbmc-20250128071432/obmc-phosphor-image-palmetto-20250128071432.static.mtd', 'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/palmetto-bmc/openbmc-20250128071432/obmc-phosphor-image-palmetto-20250128071432.static.mtd',
'bce7c392eec75c707a91cfc8fad7ca9a69d7e4f10df936930d65c1cb9897ac81'); 'bce7c392eec75c707a91cfc8fad7ca9a69d7e4f10df936930d65c1cb9897ac81')
def test_arm_ast2400_palmetto_openbmc(self): def test_arm_ast2400_palmetto_openbmc(self):
image_path = self.ASSET_PALMETTO_FLASH.fetch() image_path = self.ASSET_PALMETTO_FLASH.fetch()
self.do_test_arm_aspeed_openbmc('palmetto-bmc', image=image_path, self.do_test_arm_aspeed_openbmc('palmetto-bmc', image=image_path,
uboot='2019.04', cpu_id='0x0', uboot='2019.04', cpu_id='0x0',
soc='AST2400 rev A1'); soc='AST2400 rev A1')
if __name__ == '__main__': if __name__ == '__main__':
AspeedTest.main() AspeedTest.main()

View file

@ -12,14 +12,14 @@ class RomulusMachine(AspeedTest):
ASSET_ROMULUS_FLASH = Asset( ASSET_ROMULUS_FLASH = Asset(
'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/romulus-bmc/openbmc-20250128071340/obmc-phosphor-image-romulus-20250128071340.static.mtd', 'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/romulus-bmc/openbmc-20250128071340/obmc-phosphor-image-romulus-20250128071340.static.mtd',
'6d031376440c82ed9d087d25e9fa76aea75b42f80daa252ec402c0bc3cf6cf5b'); '6d031376440c82ed9d087d25e9fa76aea75b42f80daa252ec402c0bc3cf6cf5b')
def test_arm_ast2500_romulus_openbmc(self): def test_arm_ast2500_romulus_openbmc(self):
image_path = self.ASSET_ROMULUS_FLASH.fetch() image_path = self.ASSET_ROMULUS_FLASH.fetch()
self.do_test_arm_aspeed_openbmc('romulus-bmc', image=image_path, self.do_test_arm_aspeed_openbmc('romulus-bmc', image=image_path,
uboot='2019.04', cpu_id='0x0', uboot='2019.04', cpu_id='0x0',
soc='AST2500 rev A1'); soc='AST2500 rev A1')
if __name__ == '__main__': if __name__ == '__main__':
AspeedTest.main() AspeedTest.main()

View file

@ -12,14 +12,14 @@ class WitherspoonMachine(AspeedTest):
ASSET_WITHERSPOON_FLASH = Asset( ASSET_WITHERSPOON_FLASH = Asset(
'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/witherspoon-bmc/openbmc-20240618035022/obmc-phosphor-image-witherspoon-20240618035022.ubi.mtd', 'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/witherspoon-bmc/openbmc-20240618035022/obmc-phosphor-image-witherspoon-20240618035022.ubi.mtd',
'937d9ed449ea6c6cbed983519088a42d0cafe276bcfe4fce07772ca6673f9213'); '937d9ed449ea6c6cbed983519088a42d0cafe276bcfe4fce07772ca6673f9213')
def test_arm_ast2500_witherspoon_openbmc(self): def test_arm_ast2500_witherspoon_openbmc(self):
image_path = self.ASSET_WITHERSPOON_FLASH.fetch() image_path = self.ASSET_WITHERSPOON_FLASH.fetch()
self.do_test_arm_aspeed_openbmc('witherspoon-bmc', image=image_path, self.do_test_arm_aspeed_openbmc('witherspoon-bmc', image=image_path,
uboot='2016.07', cpu_id='0x0', uboot='2016.07', cpu_id='0x0',
soc='AST2500 rev A1'); soc='AST2500 rev A1')
if __name__ == '__main__': if __name__ == '__main__':
AspeedTest.main() AspeedTest.main()

View file

@ -163,7 +163,7 @@ class BananaPiMachine(LinuxKernelTest):
self, 'Hit any key to stop autoboot:', '=>') self, 'Hit any key to stop autoboot:', '=>')
exec_command_and_wait_for_pattern(self, "setenv extraargs '" + exec_command_and_wait_for_pattern(self, "setenv extraargs '" +
kernel_command_line + "'", '=>') kernel_command_line + "'", '=>')
exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel ...'); exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel ...')
self.wait_for_console_pattern( self.wait_for_console_pattern(
'Please press Enter to activate this console.') 'Please press Enter to activate this console.')

View file

@ -128,7 +128,7 @@ class CubieboardMachine(LinuxKernelTest):
self, 'Hit any key to stop autoboot:', '=>') self, 'Hit any key to stop autoboot:', '=>')
exec_command_and_wait_for_pattern(self, "setenv extraargs '" + exec_command_and_wait_for_pattern(self, "setenv extraargs '" +
kernel_command_line + "'", '=>') kernel_command_line + "'", '=>')
exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel ...'); exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel ...')
self.wait_for_console_pattern( self.wait_for_console_pattern(
'Please press Enter to activate this console.') 'Please press Enter to activate this console.')

View file

@ -174,7 +174,7 @@ class OrangePiMachine(LinuxKernelTest):
exec_command_and_wait_for_pattern(self, ' ', '=>') exec_command_and_wait_for_pattern(self, ' ', '=>')
exec_command_and_wait_for_pattern(self, "setenv extraargs '" + exec_command_and_wait_for_pattern(self, "setenv extraargs '" +
kernel_command_line + "'", '=>') kernel_command_line + "'", '=>')
exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel ...'); exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel ...')
self.wait_for_console_pattern('systemd[1]: Hostname set ' + self.wait_for_console_pattern('systemd[1]: Hostname set ' +
'to <orangepipc>') 'to <orangepipc>')

View file

@ -217,12 +217,12 @@ class S390CPUTopology(QemuSystemTest):
self.assertEqual(res['return']['polarization'], 'horizontal') self.assertEqual(res['return']['polarization'], 'horizontal')
self.check_topology(0, 0, 0, 0, 'medium', False) self.check_topology(0, 0, 0, 0, 'medium', False)
self.guest_set_dispatching('1'); self.guest_set_dispatching('1')
res = self.vm.qmp('query-s390x-cpu-polarization') res = self.vm.qmp('query-s390x-cpu-polarization')
self.assertEqual(res['return']['polarization'], 'vertical') self.assertEqual(res['return']['polarization'], 'vertical')
self.check_topology(0, 0, 0, 0, 'medium', False) self.check_topology(0, 0, 0, 0, 'medium', False)
self.guest_set_dispatching('0'); self.guest_set_dispatching('0')
res = self.vm.qmp('query-s390x-cpu-polarization') res = self.vm.qmp('query-s390x-cpu-polarization')
self.assertEqual(res['return']['polarization'], 'horizontal') self.assertEqual(res['return']['polarization'], 'horizontal')
self.check_topology(0, 0, 0, 0, 'medium', False) self.check_topology(0, 0, 0, 0, 'medium', False)
@ -283,7 +283,7 @@ class S390CPUTopology(QemuSystemTest):
self.check_polarization('vertical:high') self.check_polarization('vertical:high')
self.check_topology(0, 0, 0, 0, 'high', False) self.check_topology(0, 0, 0, 0, 'high', False)
self.guest_set_dispatching('0'); self.guest_set_dispatching('0')
self.check_polarization("horizontal") self.check_polarization("horizontal")
self.check_topology(0, 0, 0, 0, 'high', False) self.check_topology(0, 0, 0, 0, 'high', False)
@ -310,11 +310,11 @@ class S390CPUTopology(QemuSystemTest):
self.check_topology(0, 0, 0, 0, 'high', True) self.check_topology(0, 0, 0, 0, 'high', True)
self.check_polarization("horizontal") self.check_polarization("horizontal")
self.guest_set_dispatching('1'); self.guest_set_dispatching('1')
self.check_topology(0, 0, 0, 0, 'high', True) self.check_topology(0, 0, 0, 0, 'high', True)
self.check_polarization("vertical:high") self.check_polarization("vertical:high")
self.guest_set_dispatching('0'); self.guest_set_dispatching('0')
self.check_topology(0, 0, 0, 0, 'high', True) self.check_topology(0, 0, 0, 0, 'high', True)
self.check_polarization("horizontal") self.check_polarization("horizontal")
@ -360,7 +360,7 @@ class S390CPUTopology(QemuSystemTest):
self.check_topology(0, 0, 0, 0, 'high', True) self.check_topology(0, 0, 0, 0, 'high', True)
self.guest_set_dispatching('1'); self.guest_set_dispatching('1')
self.check_topology(0, 0, 0, 0, 'high', True) self.check_topology(0, 0, 0, 0, 'high', True)