Skip to content

Commit

Permalink
Merge pull request #63 from ihenyene/master
Browse files Browse the repository at this point in the history
Changing from "is" to "=="
  • Loading branch information
ihenyene authored Feb 7, 2023
2 parents 55978b2 + 0bbf546 commit ed013aa
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion _modules/win_lgpo.py
Original file line number Diff line number Diff line change
Expand Up @@ -4702,7 +4702,7 @@ def _powershell_script_order_reverse_conversion(cls, val, **kwargs):
return 'true'
elif val.upper() == 'Run Windows PowerShell scripts last'.upper():
return 'false'
elif val is 'Not Configured':
elif val == 'Not Configured':
return None
else:
return 'Invalid Value'
Expand Down
14 changes: 8 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image: Visual Studio 2017
environment:
global:
SALT_FILEROOT: '%APPVEYOR_BUILD_FOLDER%'
SALT_URL: https://repo.saltproject.io/windows/Salt-Minion-3003.3-Py3-AMD64-Setup.exe
SALT_URL: https://watchmaker.cloudarmor.io/watchmaker/repo/saltstack/salt/windows/Salt-Minion-3004.2-1-Py3-AMD64-Setup.exe
SALT_PILLARROOT: '%APPVEYOR_BUILD_FOLDER%\tests\pillar\test-windows-main'
matrix:
- SALT_STATE: ash-windows
Expand Down Expand Up @@ -32,22 +32,23 @@ install:
$null = `
Start-Process -FilePath "${env:temp}\salt-minion.exe" `
-ArgumentList "/S" -NoNewWindow -PassThru -Wait
- ps: C:\salt\salt-call.bat --versions-report
- ps: >
& "C:\Program Files\Salt Project\Salt\salt-call.bat" --versions-report
test_script:
- ps: >
yamllint -d
"{extends: default, rules: {line-length: false, document-start: false, truthy: false}}"
.
- ps: |
C:\salt\salt-call.bat --local --retcode-passthrough `
& "C:\Program Files\Salt Project\Salt\salt-call.bat" --local --retcode-passthrough `
--log-file-level debug `
--file-root="${env:SALT_FILEROOT}" `
--pillar-root="${env:SALT_PILLARROOT}" `
state.show_sls `
"${env:SALT_STATE}"
- ps: |
C:\salt\salt-call.bat --local --retcode-passthrough `
& "C:\Program Files\Salt Project\Salt\salt-call.bat" --local --retcode-passthrough `
--log-file-level debug `
--file-root="${env:SALT_FILEROOT}" `
--pillar-root="${env:SALT_PILLARROOT}" `
Expand All @@ -58,9 +59,10 @@ test_script:
mock=True
on_failure:
- ps: C:\salt\salt-call.bat --local grains.items
- ps: >
& "C:\Program Files\Salt Project\Salt\salt-call.bat" --local grains.items
- ps: dir "env:"
- ps: get-content C:\salt\var\log\salt\*
- ps: get-content "C:\Program Files\Salt Project\Salt\var\log\salt\*"

### To enable remote debugging uncomment this (also, see: http://www.appveyor.com/docs/how-to/rdp-to-build-worker):
# on_finish:
Expand Down

0 comments on commit ed013aa

Please sign in to comment.