Skip to content

Commit 4bfec8e

Browse files
committed
Move Windows guest util functions to lib/windows
Signed-off-by: Tu Dinh <[email protected]>
1 parent 4f708e4 commit 4bfec8e

File tree

6 files changed

+6
-9
lines changed

6 files changed

+6
-9
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/guest_tools/win/conftest.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@
88
from lib.snapshot import Snapshot
99
from lib.sr import SR
1010
from lib.vm import VM
11-
12-
from . import (
11+
from lib.windows import (
1312
WINDOWS_SHUTDOWN_COMMAND,
1413
PowerAction,
1514
iso_create,
1615
try_get_and_store_vm_ip_serial,
1716
wait_for_vm_running_and_ssh_up_without_tools,
1817
)
19-
from .guest_tools import install_guest_tools
20-
from .other_tools import install_other_drivers
18+
from lib.windows.guest_tools import install_guest_tools
19+
from lib.windows.other_tools import install_other_drivers
2120

2221
from typing import Any, Dict, Tuple
2322

tests/guest_tools/win/test_guest_tools_win.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@
66
from lib.commands import SSHCommandFailed
77
from lib.common import strtobool, wait_for
88
from lib.vm import VM
9-
10-
from . import (
9+
from lib.windows import (
1110
WINDOWS_SHUTDOWN_COMMAND,
1211
PowerAction,
1312
check_vm_dns,
1413
set_vm_dns,
1514
vif_has_rss,
1615
wait_for_vm_running_and_ssh_up_without_tools,
1716
)
18-
from .guest_tools import (
17+
from lib.windows.guest_tools import (
1918
ERROR_INSTALL_FAILURE,
2019
install_guest_tools,
2120
uninstall_guest_tools,

tests/guest_tools/win/test_xenclean.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
from lib.common import wait_for
77
from lib.vm import VM
8-
9-
from . import (
8+
from lib.windows import (
109
WINDOWS_SHUTDOWN_COMMAND,
1110
check_vm_dns,
1211
insert_cd_safe,

0 commit comments

Comments
 (0)