mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Attempt to fix windows package tests
This commit is contained in:
parent
e2e3dc9634
commit
80a2f65e58
1 changed files with 8 additions and 2 deletions
|
@ -11,15 +11,21 @@ from salt.exceptions import CommandExecutionError
|
|||
|
||||
try:
|
||||
import psutil
|
||||
import pywintypes
|
||||
import win32api
|
||||
import win32net
|
||||
import win32security
|
||||
from win32con import HWND_BROADCAST, SMTO_ABORTIFHUNG, WM_SETTINGCHANGE
|
||||
|
||||
import pywintypes # isort:skip
|
||||
|
||||
HAS_WIN32 = True
|
||||
except ImportError:
|
||||
HAS_WIN32 = False
|
||||
try:
|
||||
import psutil
|
||||
from win32 import pywintypes, win32api, win32net, win32security
|
||||
from win32con import HWND_BROADCAST, SMTO_ABORTIFHUNG, WM_SETTINGCHANGE
|
||||
except ImportError:
|
||||
HAS_WIN32 = False
|
||||
|
||||
|
||||
# Although utils are often directly imported, it is also possible to use the
|
||||
|
|
Loading…
Add table
Reference in a new issue