From nobody Sun Dec 14 12:15:22 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764749000679920.7127500571781; Wed, 3 Dec 2025 00:03:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQhnR-00013e-Ry; Wed, 03 Dec 2025 03:01:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vQhnQ-00012n-4V; Wed, 03 Dec 2025 03:01:08 -0500 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vQhnN-00070c-5i; Wed, 03 Dec 2025 03:01:07 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 34417170770; Wed, 03 Dec 2025 10:59:23 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id F159932B497; Wed, 03 Dec 2025 10:59:40 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Nina Schoetterl-Glausch , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Michael Tokarev Subject: [Stable-10.0.7 099/116] tests/functional: Remove semicolons at the end of lines Date: Wed, 3 Dec 2025 10:59:19 +0300 Message-ID: <20251203075939.2366131-18-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1764749003198019200 From: Thomas Huth 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=C3=A9 Reviewed-by: Nina Schoetterl-Glausch Reviewed-by: C=C3=A9dric Le Goater Message-ID: <20250327201305.996241-1-thuth@redhat.com> Signed-off-by: Thomas Huth (cherry picked from commit 858640eaee9f3039580118f5629825825cea311a) Signed-off-by: Michael Tokarev diff --git a/tests/functional/aspeed.py b/tests/functional/aspeed.py index 77dc8930fa..7a40d5dda7 100644 --- a/tests/functional/aspeed.py +++ b/tests/functional/aspeed.py @@ -44,7 +44,7 @@ def do_test_arm_aspeed_buildroot_start(self, image, cpu_i= d, pattern=3D'Aspeed EVB' =20 def do_test_arm_aspeed_buildroot_poweroff(self): exec_command_and_wait_for_pattern(self, 'poweroff', - 'System halted'); + 'System halted') =20 def do_test_arm_aspeed_sdk_start(self, image): self.require_netdev('user') diff --git a/tests/functional/test_aarch64_aspeed.py b/tests/functional/tes= t_aarch64_aspeed.py index c25c966278..c7f3b3b319 100755 --- a/tests/functional/test_aarch64_aspeed.py +++ b/tests/functional/test_aarch64_aspeed.py @@ -85,7 +85,7 @@ def start_ast2700_test(self, name): =20 exec_command_and_wait_for_pattern(self, '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, 'cat /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input', '0= ') self.vm.cmd('qom-set', path=3D'/machine/peripheral/tmp-test', diff --git a/tests/functional/test_arm_aspeed_ast2500.py b/tests/functional= /test_arm_aspeed_ast2500.py index 1ffba6c995..ddc6459f71 100755 --- a/tests/functional/test_arm_aspeed_ast2500.py +++ b/tests/functional/test_arm_aspeed_ast2500.py @@ -22,17 +22,17 @@ def test_arm_ast2500_evb_buildroot(self): image_path =3D self.ASSET_BR2_202411_AST2500_FLASH.fetch() =20 self.vm.add_args('-device', - 'tmp105,bus=3Daspeed.i2c.bus.3,address=3D0x4d,id= =3Dtmp-test'); + 'tmp105,bus=3Daspeed.i2c.bus.3,address=3D0x4d,id= =3Dtmp-test') self.do_test_arm_aspeed_buildroot_start(image_path, '0x0', 'ast2500-evb login:') =20 exec_command_and_wait_for_pattern(self, '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, 'cat /sys/class/hwmon/hwmon1/temp1_input', '0= ') self.vm.cmd('qom-set', path=3D'/machine/peripheral/tmp-test', - property=3D'temperature', value=3D18000); + property=3D'temperature', value=3D18000) exec_command_and_wait_for_pattern(self, 'cat /sys/class/hwmon/hwmon1/temp1_input', '1= 8000') =20 diff --git a/tests/functional/test_arm_aspeed_ast2600.py b/tests/functional= /test_arm_aspeed_ast2600.py index 6ae4ed636a..5ef52f0659 100755 --- a/tests/functional/test_arm_aspeed_ast2600.py +++ b/tests/functional/test_arm_aspeed_ast2600.py @@ -27,38 +27,38 @@ def test_arm_ast2600_evb_buildroot(self): image_path =3D self.ASSET_BR2_202411_AST2600_FLASH.fetch() =20 self.vm.add_args('-device', - 'tmp105,bus=3Daspeed.i2c.bus.3,address=3D0x4d,id= =3Dtmp-test'); + 'tmp105,bus=3Daspeed.i2c.bus.3,address=3D0x4d,id= =3Dtmp-test') self.vm.add_args('-device', - 'ds1338,bus=3Daspeed.i2c.bus.3,address=3D0x32'); + 'ds1338,bus=3Daspeed.i2c.bus.3,address=3D0x32') self.vm.add_args('-device', - 'i2c-echo,bus=3Daspeed.i2c.bus.3,address=3D0x42'); + 'i2c-echo,bus=3Daspeed.i2c.bus.3,address=3D0x42') self.do_test_arm_aspeed_buildroot_start(image_path, '0xf00', 'ast2600-evb login:') =20 exec_command_and_wait_for_pattern(self, '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, 'cat /sys/class/hwmon/hwmon1/temp1_input', '0= ') self.vm.cmd('qom-set', path=3D'/machine/peripheral/tmp-test', - property=3D'temperature', value=3D18000); + property=3D'temperature', value=3D18000) exec_command_and_wait_for_pattern(self, 'cat /sys/class/hwmon/hwmon1/temp1_input', '1= 8000') =20 exec_command_and_wait_for_pattern(self, 'echo ds1307 0x32 > /sys/class/i2c-dev/i2c-3/device/new_devic= e', - 'i2c i2c-3: new_device: Instantiated device ds1307 at 0x32'); + 'i2c i2c-3: new_device: Instantiated device ds1307 at 0x32') year =3D time.strftime("%Y") - exec_command_and_wait_for_pattern(self, 'hwclock -f /dev/rtc1', ye= ar); + exec_command_and_wait_for_pattern(self, 'hwclock -f /dev/rtc1', ye= ar) =20 exec_command_and_wait_for_pattern(self, 'echo slave-24c02 0x1064 > /sys/bus/i2c/devices/i2c-3/new_dev= ice', - 'i2c i2c-3: new_device: Instantiated device slave-24c02 at 0x= 64'); + 'i2c i2c-3: new_device: Instantiated device slave-24c02 at 0x= 64') 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, '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() =20 ASSET_BR2_202302_AST2600_TPM_FLASH =3D Asset( @@ -90,10 +90,10 @@ def test_arm_ast2600_evb_buildroot_tpm(self): =20 exec_command_and_wait_for_pattern(self, 'echo tpm_tis_i2c 0x2e > /sys/bus/i2c/devices/i2c-12/new_devic= e', - '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, 'cat /sys/class/tpm/tpm0/pcr-sha256/0', - 'B804724EA13F52A9072BA87FE8FDCC497DFC9DF9AA15B9088694639C43168= 8E0'); + 'B804724EA13F52A9072BA87FE8FDCC497DFC9DF9AA15B9088694639C43168= 8E0') =20 self.do_test_arm_aspeed_buildroot_poweroff() =20 @@ -107,9 +107,9 @@ def test_arm_ast2600_evb_sdk(self): self.archive_extract(self.ASSET_SDK_V806_AST2600_A2) =20 self.vm.add_args('-device', - 'tmp105,bus=3Daspeed.i2c.bus.5,address=3D0x4d,id=3Dtmp-test'); + 'tmp105,bus=3Daspeed.i2c.bus.5,address=3D0x4d,id=3Dtmp-test') self.vm.add_args('-device', - 'ds1338,bus=3Daspeed.i2c.bus.5,address=3D0x32'); + 'ds1338,bus=3Daspeed.i2c.bus.5,address=3D0x32') self.do_test_arm_aspeed_sdk_start( self.scratch_file("ast2600-a2", "image-bmc")) =20 @@ -120,20 +120,20 @@ def test_arm_ast2600_evb_sdk(self): =20 exec_command_and_wait_for_pattern(self, '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, 'cat /sys/class/hwmon/hwmon19/temp1_input', '0') self.vm.cmd('qom-set', path=3D'/machine/peripheral/tmp-test', - property=3D'temperature', value=3D18000); + property=3D'temperature', value=3D18000) exec_command_and_wait_for_pattern(self, 'cat /sys/class/hwmon/hwmon19/temp1_input', '18000') =20 exec_command_and_wait_for_pattern(self, 'echo ds1307 0x32 > /sys/class/i2c-dev/i2c-5/device/new_devic= e', - 'i2c i2c-5: new_device: Instantiated device ds1307 at 0x32'); + 'i2c i2c-5: new_device: Instantiated device ds1307 at 0x32') year =3D time.strftime("%Y") exec_command_and_wait_for_pattern(self, - '/sbin/hwclock -f /dev/rtc1', year); + '/sbin/hwclock -f /dev/rtc1', year) =20 if __name__ =3D=3D '__main__': AspeedTest.main() diff --git a/tests/functional/test_arm_aspeed_bletchley.py b/tests/function= al/test_arm_aspeed_bletchley.py index 0da856c5ed..5a60b24b3d 100644 --- a/tests/functional/test_arm_aspeed_bletchley.py +++ b/tests/functional/test_arm_aspeed_bletchley.py @@ -12,14 +12,14 @@ class BletchleyMachine(AspeedTest): =20 ASSET_BLETCHLEY_FLASH =3D Asset( 'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/bl= etchley-bmc/openbmc-20250128071329/obmc-phosphor-image-bletchley-2025012807= 1329.static.mtd.xz', - 'db21d04d47d7bb2a276f59d308614b4dfb70b9c7c81facbbca40a3977a2d8844'= ); + 'db21d04d47d7bb2a276f59d308614b4dfb70b9c7c81facbbca40a3977a2d8844') =20 def test_arm_ast2600_bletchley_openbmc(self): image_path =3D self.uncompress(self.ASSET_BLETCHLEY_FLASH) =20 self.do_test_arm_aspeed_openbmc('bletchley-bmc', image=3Dimage_pat= h, uboot=3D'2019.04', cpu_id=3D'0xf00= ', - soc=3D'AST2600 rev A3'); + soc=3D'AST2600 rev A3') =20 if __name__ =3D=3D '__main__': AspeedTest.main() diff --git a/tests/functional/test_arm_aspeed_palmetto.py b/tests/functiona= l/test_arm_aspeed_palmetto.py index 35d832bc98..ff0b821be6 100755 --- a/tests/functional/test_arm_aspeed_palmetto.py +++ b/tests/functional/test_arm_aspeed_palmetto.py @@ -12,14 +12,14 @@ class PalmettoMachine(AspeedTest): =20 ASSET_PALMETTO_FLASH =3D Asset( 'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/pa= lmetto-bmc/openbmc-20250128071432/obmc-phosphor-image-palmetto-202501280714= 32.static.mtd', - 'bce7c392eec75c707a91cfc8fad7ca9a69d7e4f10df936930d65c1cb9897ac81'= ); + 'bce7c392eec75c707a91cfc8fad7ca9a69d7e4f10df936930d65c1cb9897ac81') =20 def test_arm_ast2400_palmetto_openbmc(self): image_path =3D self.ASSET_PALMETTO_FLASH.fetch() =20 self.do_test_arm_aspeed_openbmc('palmetto-bmc', image=3Dimage_path, uboot=3D'2019.04', cpu_id=3D'0x0', - soc=3D'AST2400 rev A1'); + soc=3D'AST2400 rev A1') =20 if __name__ =3D=3D '__main__': AspeedTest.main() diff --git a/tests/functional/test_arm_aspeed_romulus.py b/tests/functional= /test_arm_aspeed_romulus.py index b97ed951b1..0447212bbf 100755 --- a/tests/functional/test_arm_aspeed_romulus.py +++ b/tests/functional/test_arm_aspeed_romulus.py @@ -12,14 +12,14 @@ class RomulusMachine(AspeedTest): =20 ASSET_ROMULUS_FLASH =3D Asset( 'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/ro= mulus-bmc/openbmc-20250128071340/obmc-phosphor-image-romulus-20250128071340= .static.mtd', - '6d031376440c82ed9d087d25e9fa76aea75b42f80daa252ec402c0bc3cf6cf5b'= ); + '6d031376440c82ed9d087d25e9fa76aea75b42f80daa252ec402c0bc3cf6cf5b') =20 def test_arm_ast2500_romulus_openbmc(self): image_path =3D self.ASSET_ROMULUS_FLASH.fetch() =20 self.do_test_arm_aspeed_openbmc('romulus-bmc', image=3Dimage_path, uboot=3D'2019.04', cpu_id=3D'0x0', - soc=3D'AST2500 rev A1'); + soc=3D'AST2500 rev A1') =20 if __name__ =3D=3D '__main__': AspeedTest.main() diff --git a/tests/functional/test_arm_aspeed_witherspoon.py b/tests/functi= onal/test_arm_aspeed_witherspoon.py index ea1ce89b05..51a2d47af2 100644 --- a/tests/functional/test_arm_aspeed_witherspoon.py +++ b/tests/functional/test_arm_aspeed_witherspoon.py @@ -12,14 +12,14 @@ class WitherspoonMachine(AspeedTest): =20 ASSET_WITHERSPOON_FLASH =3D Asset( 'https://github.com/legoater/qemu-aspeed-boot/raw/master/images/wi= therspoon-bmc/openbmc-20240618035022/obmc-phosphor-image-witherspoon-202406= 18035022.ubi.mtd', - '937d9ed449ea6c6cbed983519088a42d0cafe276bcfe4fce07772ca6673f9213'= ); + '937d9ed449ea6c6cbed983519088a42d0cafe276bcfe4fce07772ca6673f9213') =20 def test_arm_ast2500_witherspoon_openbmc(self): image_path =3D self.ASSET_WITHERSPOON_FLASH.fetch() =20 self.do_test_arm_aspeed_openbmc('witherspoon-bmc', image=3Dimage_p= ath, uboot=3D'2016.07', cpu_id=3D'0x0', - soc=3D'AST2500 rev A1'); + soc=3D'AST2500 rev A1') =20 if __name__ =3D=3D '__main__': AspeedTest.main() diff --git a/tests/functional/test_arm_bpim2u.py b/tests/functional/test_ar= m_bpim2u.py index 8de6ccba88..8bed64b702 100755 --- a/tests/functional/test_arm_bpim2u.py +++ b/tests/functional/test_arm_bpim2u.py @@ -163,7 +163,7 @@ def test_arm_bpim2u_openwrt_22_03_3(self): self, 'Hit any key to stop autoboot:', '=3D>') exec_command_and_wait_for_pattern(self, "setenv extraargs '" + kernel_command_line + "'",= '=3D>') - exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel .= ..'); + exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel .= ..') =20 self.wait_for_console_pattern( 'Please press Enter to activate this console.') diff --git a/tests/functional/test_arm_cubieboard.py b/tests/functional/tes= t_arm_cubieboard.py index b87a28154d..1eaca0272b 100755 --- a/tests/functional/test_arm_cubieboard.py +++ b/tests/functional/test_arm_cubieboard.py @@ -128,7 +128,7 @@ def test_arm_cubieboard_openwrt_22_03_2(self): self, 'Hit any key to stop autoboot:', '=3D>') exec_command_and_wait_for_pattern(self, "setenv extraargs '" + kernel_command_line + "'",= '=3D>') - exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel .= ..'); + exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel .= ..') =20 self.wait_for_console_pattern( 'Please press Enter to activate this console.') diff --git a/tests/functional/test_arm_orangepi.py b/tests/functional/test_= arm_orangepi.py index 1815f56e02..f9bfa8c78d 100755 --- a/tests/functional/test_arm_orangepi.py +++ b/tests/functional/test_arm_orangepi.py @@ -174,7 +174,7 @@ def test_arm_orangepi_armbian(self): exec_command_and_wait_for_pattern(self, ' ', '=3D>') exec_command_and_wait_for_pattern(self, "setenv extraargs '" + kernel_command_line + "'",= '=3D>') - exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel .= ..'); + exec_command_and_wait_for_pattern(self, 'boot', 'Starting kernel .= ..') =20 self.wait_for_console_pattern('systemd[1]: Hostname set ' + 'to ') diff --git a/tests/functional/test_s390x_topology.py b/tests/functional/tes= t_s390x_topology.py index eefd9729cb..1b5dc65135 100755 --- a/tests/functional/test_s390x_topology.py +++ b/tests/functional/test_s390x_topology.py @@ -217,12 +217,12 @@ def test_polarization(self): self.assertEqual(res['return']['polarization'], 'horizontal') self.check_topology(0, 0, 0, 0, 'medium', False) =20 - self.guest_set_dispatching('1'); + self.guest_set_dispatching('1') res =3D self.vm.qmp('query-s390x-cpu-polarization') self.assertEqual(res['return']['polarization'], 'vertical') self.check_topology(0, 0, 0, 0, 'medium', False) =20 - self.guest_set_dispatching('0'); + self.guest_set_dispatching('0') res =3D self.vm.qmp('query-s390x-cpu-polarization') self.assertEqual(res['return']['polarization'], 'horizontal') self.check_topology(0, 0, 0, 0, 'medium', False) @@ -283,7 +283,7 @@ def test_entitlement(self): self.check_polarization('vertical:high') self.check_topology(0, 0, 0, 0, 'high', False) =20 - self.guest_set_dispatching('0'); + self.guest_set_dispatching('0') self.check_polarization("horizontal") self.check_topology(0, 0, 0, 0, 'high', False) =20 @@ -310,11 +310,11 @@ def test_dedicated(self): self.check_topology(0, 0, 0, 0, 'high', True) self.check_polarization("horizontal") =20 - self.guest_set_dispatching('1'); + self.guest_set_dispatching('1') self.check_topology(0, 0, 0, 0, 'high', True) self.check_polarization("vertical:high") =20 - self.guest_set_dispatching('0'); + self.guest_set_dispatching('0') self.check_topology(0, 0, 0, 0, 'high', True) self.check_polarization("horizontal") =20 @@ -360,7 +360,7 @@ def test_dedicated_error(self): =20 self.check_topology(0, 0, 0, 0, 'high', True) =20 - self.guest_set_dispatching('1'); + self.guest_set_dispatching('1') =20 self.check_topology(0, 0, 0, 0, 'high', True) =20 --=20 2.47.3