valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #42154 from twangboy/win_unit_test_reg

Browse Source 
Fix `unit.modules.test_reg_win` for Windows
This commit is contained in:
Nicole Thomas 2017-07-19 10:00:38 -06:00 committed by GitHub
commit ade25c6b34
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/reg.py
View File

@ -150,7 +150,9 @@ class Registry(object): # pylint: disable=R0903
_winreg.REG_DWORD: 'REG_DWORD',
_winreg.REG_EXPAND_SZ: 'REG_EXPAND_SZ',
_winreg.REG_MULTI_SZ: 'REG_MULTI_SZ',
_winreg.REG_SZ: 'REG_SZ'
_winreg.REG_SZ: 'REG_SZ',
# REG_QWORD isn't in the winreg library
11: 'REG_QWORD'
}
self.opttype_reverse = {
_winreg.REG_OPTION_NON_VOLATILE: 'REG_OPTION_NON_VOLATILE',

2
tests/unit/modules/test_reg_win.py
View File

@ -27,7 +27,7 @@ except ImportError:
PY2 = sys.version_info[0] == 2
# The following used to make sure we are not
# testing already existing data
# Note strftime retunrns a str, so we need to make it unicode
# Note strftime returns a str, so we need to make it unicode
TIMEINT = int(time.time())
if PY2: