diff --git a/provider/input_event_proxy.py b/provider/input_event_proxy.py index 1e53d1068a0..7f45f0eb157 100644 --- a/provider/input_event_proxy.py +++ b/provider/input_event_proxy.py @@ -492,7 +492,7 @@ class EventListenerWin(_EventListener): agent_source = os.path.join(DEP_DIR, 'input_event_win.py') agent_target = r'%TEMP%\input_event.py' - python_bin = 'python2' + python_bin = 'python' def _uninstall(self): cmd = ' '.join(('del', self.agent_target)) diff --git a/qemu/tests/cfg/cdrom_test.cfg b/qemu/tests/cfg/cdrom_test.cfg index 41f453b0cc9..861d938d316 100644 --- a/qemu/tests/cfg/cdrom_test.cfg +++ b/qemu/tests/cfg/cdrom_test.cfg @@ -61,7 +61,7 @@ dst_file = "${tmp_dir}%s" remove_file_cmd = "del /f /q ${tmp_dir}%s" copy_file_cmd = "copy /y %s\%s ${tmp_dir}\" - tray_check_cmd = "c:\python27\python.exe ${tray_check_src} %s" + tray_check_cmd = "c:\python312\python.exe ${tray_check_src} %s" lock_cdrom_cmd = "eject.exe -i on %s" unlock_cdrom_cmd = "eject.exe -i off %s" eject_cdrom_cmd = "eject.exe %s" diff --git a/qemu/tests/cfg/driver_load_stress.cfg b/qemu/tests/cfg/driver_load_stress.cfg index c3488698c68..58f51943bb9 100644 --- a/qemu/tests/cfg/driver_load_stress.cfg +++ b/qemu/tests/cfg/driver_load_stress.cfg @@ -150,7 +150,7 @@ guest_script_folder = C:\ clean_cmd = del /f /q tmp_dir = %TEMP% - python_bin = python2.7 + python_bin = python file_sender = guest target_process = ${python_bin}.exe - with_viofs: diff --git a/qemu/tests/cfg/ioeventfd.cfg b/qemu/tests/cfg/ioeventfd.cfg index b0d1ad260a5..a341f96ae43 100644 --- a/qemu/tests/cfg/ioeventfd.cfg +++ b/qemu/tests/cfg/ioeventfd.cfg @@ -54,7 +54,7 @@ guest_script_folder = C:\ clean_cmd = del /f /q tmp_dir = %TEMP% - python_bin = python2.7 + python_bin = python s390x: dev_id = 'virtio_serial_ccw0' orig_ioeventfd = "ioeventfd=on" diff --git a/qemu/tests/cfg/qemu_guest_agent.cfg b/qemu/tests/cfg/qemu_guest_agent.cfg index 08ff7ff9abf..249ee27fe80 100644 --- a/qemu/tests/cfg/qemu_guest_agent.cfg +++ b/qemu/tests/cfg/qemu_guest_agent.cfg @@ -156,7 +156,7 @@ gagent_check_type = get_time get_guest_time_cmd = `command -v python python3 | head -1` -c "import time; print(int(time.time()))" Windows: - get_guest_time_cmd = python2.7 -c "import time; print(int(time.time()))" + get_guest_time_cmd = python -c "import time; print(int(time.time()))" - check_memory_leak: only Windows gagent_check_type = memory_leak @@ -170,7 +170,7 @@ gagent_check_type = set_time get_guest_time_cmd = `command -v python python3 | head -1` -c "import time; print(int(time.time()))" Windows: - get_guest_time_cmd = python2.7 -c "import time; print(int(time.time()))" + get_guest_time_cmd = python -c "import time; print(int(time.time()))" move_time_cmd = "date --rfc-3339=seconds --utc; date --set='now - 1 week' > /dev/null; date --rfc-3339=seconds --utc" variants: - @default: @@ -181,7 +181,7 @@ gagent_check_type = time_sync image_snapshot = yes rtc_drift = none - get_guest_time_cmd = python2.7 -c "import time; print(int(time.time()))" + get_guest_time_cmd = python -c "import time; print(int(time.time()))" time_service_config = w32tm /config /manualpeerlist:"clock.redhat.com" /syncfromflags:manual /reliable:yes /update time_service_status_cmd = sc query w32time |findstr "RUNNING" time_service_stop_cmd = net stop w32time @@ -445,7 +445,7 @@ cmd_get_user_domain = wmic useraccount where name='%s' get domain |findstr /vi domain # 3/3/2020 9:35 AM time_pattern = " (\d+/\d+/\d+ \d+:\d+ [APap][Mm])" - cmd_time_trans = python2.7 -c "import time; dt='%s'; t=time.mktime(time.strptime(dt, '%%m/%%d/%%Y %%I:%%M %%p')); print(t)" + cmd_time_trans = python -c "import time; dt='%s'; t=time.mktime(time.strptime(dt, '%%m/%%d/%%Y %%I:%%M %%p')); print(t)" - check_os_info: no RHEL.6 gagent_check_type = os_info diff --git a/qemu/tests/cfg/vioser_in_use.cfg b/qemu/tests/cfg/vioser_in_use.cfg index 68f77c1d8ed..c671f461679 100644 --- a/qemu/tests/cfg/vioser_in_use.cfg +++ b/qemu/tests/cfg/vioser_in_use.cfg @@ -13,7 +13,7 @@ clean_cmd = del /f /q guest_script_folder = C:\ tmp_dir = %TEMP% - python_bin = python2.7 + python_bin = python target_process = ${python_bin}.exe memory_leak_check = yes Windows: diff --git a/qemu/tests/cfg/virtio_fs_share_data.cfg b/qemu/tests/cfg/virtio_fs_share_data.cfg index c10a85bb678..59f8f3da7e1 100644 --- a/qemu/tests/cfg/virtio_fs_share_data.cfg +++ b/qemu/tests/cfg/virtio_fs_share_data.cfg @@ -90,7 +90,7 @@ no Host_RHEL.m8 fs_binary_extra_options += " --log-level debug" winapi_dir_name = test_winapi - create_dir_winapi_cmd = python2.7 -c "import ctypes; dll=ctypes.windll.kernel32;dll.CreateDirectoryA('%s\\${winapi_dir_name}', 0)" + create_dir_winapi_cmd = python -c "import ctypes; dll=ctypes.windll.kernel32;dll.CreateDirectoryA('%s\\${winapi_dir_name}', 0)" check_winapi_dir_cmd = "dir %s\${winapi_dir_name}" - viofs_service_stop_start: only Windows diff --git a/qemu/tests/cfg/virtio_port_hotplug.cfg b/qemu/tests/cfg/virtio_port_hotplug.cfg index 4bba49d63f0..1a7025b666d 100644 --- a/qemu/tests/cfg/virtio_port_hotplug.cfg +++ b/qemu/tests/cfg/virtio_port_hotplug.cfg @@ -14,7 +14,7 @@ guest_script_folder = C:\ clean_cmd = del /f /q tmp_dir = %TEMP% - python_bin = python2.7 + python_bin = python target_process = ${python_bin}.exe i386, i686: devcon_dirname = 'x86' diff --git a/qemu/tests/cfg/virtio_serial_file_transfer.cfg b/qemu/tests/cfg/virtio_serial_file_transfer.cfg index b901648291c..ffe3ef138b1 100644 --- a/qemu/tests/cfg/virtio_serial_file_transfer.cfg +++ b/qemu/tests/cfg/virtio_serial_file_transfer.cfg @@ -16,7 +16,7 @@ guest_script_folder = C:\ clean_cmd = del /f /q tmp_dir = %TEMP% - python_bin = python2.7 + python_bin = python memory_leak_check = yes i386, i686: devcon_dirname = 'x86' @@ -75,9 +75,9 @@ chardev_abstract_vs1 = 'on' variants: - tight_on: - chardev_tight_vs1 = 'on' + chardev_tight_vs1 = 'on' - tight_off: - chardev_tight_vs1 = 'off' + chardev_tight_vs1 = 'off' variants: - unix_socket: - tcp_socket: @@ -85,7 +85,7 @@ - pty: chardev_backend_vs1 = pty variants: - - @default: + - @default: - iommu_enabled: virtio_dev_iommu_platform = on x86_64, i386: diff --git a/qemu/tests/cfg/win_virtio_driver_install_by_installer.cfg b/qemu/tests/cfg/win_virtio_driver_install_by_installer.cfg index 1cc4dbf524c..c2fafe6c5de 100644 --- a/qemu/tests/cfg/win_virtio_driver_install_by_installer.cfg +++ b/qemu/tests/cfg/win_virtio_driver_install_by_installer.cfg @@ -163,7 +163,7 @@ transfer_timeout = 720 tmp_dir = %TEMP% host_script = serial_host_send_receive.py - python_bin = python2.7 + python_bin = python - with_netkvm: nics += " nic2" nic_model_nic2 = virtio diff --git a/qemu/tests/cfg/win_virtio_driver_update_test.cfg b/qemu/tests/cfg/win_virtio_driver_update_test.cfg index 23fc3cfe2de..79a25ad63f2 100644 --- a/qemu/tests/cfg/win_virtio_driver_update_test.cfg +++ b/qemu/tests/cfg/win_virtio_driver_update_test.cfg @@ -184,7 +184,7 @@ guest_script_folder = C:\ clean_cmd = del /f /q tmp_dir = %TEMP% - python_bin = python2.7 + python_bin = python file_sender = guest target_process = ${python_bin}.exe - with_vioinput: