valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #39489 from twangboy/win_unit_tests

Browse Source 
Set hard limit on Windows
This commit is contained in:
Mike Place 2017-02-17 15:13:07 -07:00 committed by GitHub
commit 10808f47ab
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/runtests.py
View File

@ -472,7 +472,12 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
for integration tests or unit tests
'''
# Get current limits
prev_soft, prev_hard = resource.getrlimit(resource.RLIMIT_NOFILE)
if salt.utils.is_windows():
import win32file
prev_hard = win32file._getmaxstdio()
prev_soft = 512
else:
prev_soft, prev_hard = resource.getrlimit(resource.RLIMIT_NOFILE)
# Get required limits
min_soft = MAX_OPEN_FILES[limits]['soft_limit']
@ -503,7 +508,11 @@ class SaltTestsuiteParser(SaltCoverageTestingParser):
'{0}, hard: {1}'.format(soft, hard)
)
try:
resource.setrlimit(resource.RLIMIT_NOFILE, (soft, hard))
if salt.utils.is_windows():
hard = 2048 if hard > 2048 else hard
win32file._setmaxstdio(hard)
else:
resource.setrlimit(resource.RLIMIT_NOFILE, (soft, hard))
except Exception as err:
print(
'ERROR: Failed to raise the max open files settings -> '