Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update python_bin in our windows testing #3965

Merged
merged 1 commit into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion provider/input_event_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion qemu/tests/cfg/cdrom_test.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "python ${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"
Expand Down
2 changes: 1 addition & 1 deletion qemu/tests/cfg/driver_load_stress.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion qemu/tests/cfg/ioeventfd.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions qemu/tests/cfg/qemu_guest_agent.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,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
Expand All @@ -172,7 +172,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:
Expand All @@ -183,7 +183,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
Expand Down Expand Up @@ -447,7 +447,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
Expand Down
2 changes: 1 addition & 1 deletion qemu/tests/cfg/vioser_in_use.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion qemu/tests/cfg/virtio_fs_share_data.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion qemu/tests/cfg/virtio_port_hotplug.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions qemu/tests/cfg/virtio_serial_file_transfer.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -75,17 +75,17 @@
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:
chardev_backend_vs1 = tcp_socket
- pty:
chardev_backend_vs1 = pty
variants:
- @default:
- @default:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update these code due to it will introduce some CI check failure.

https://github.com/autotest/tp-qemu/actions/runs/8044679165/job/21968654468?pr=3965

- iommu_enabled:
virtio_dev_iommu_platform = on
x86_64, i386:
Expand Down
2 changes: 1 addition & 1 deletion qemu/tests/cfg/win_virtio_driver_install_by_installer.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion qemu/tests/cfg/win_virtio_driver_update_test.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading