Commit Graph

84134 Commits

Author SHA1 Message Date
Nicole Thomas
5c123eb551
Merge pull request #44538 from gtmanfred/kitchen
Fix up some test kitchen stuff
2017-11-14 15:36:55 -05:00
Daniel Wallace
3e04d2d44c
use kitchen-sync for copying files 2017-11-14 11:39:44 -07:00
Daniel Wallace
9bc70fd31b
back up to 2017.7.1 for kitchen tests
Until https://github.com/saltstack/salt/pull/44016 is included centos tests need to use 2017.7.1, otherwise it is unable to download the busybox binary.
2017-11-14 11:39:09 -07:00
Daniel Wallace
3b93ea058b
ubuntu 14 and centos 6 should not have py3 tests 2017-11-13 15:53:09 -07:00
Mike Place
27a7b607b1
Merge pull request #42064 from The-Loeki/jinja_unicode
utils.jinja: use utils.yamldumper for safe yaml dumping
2017-11-13 12:45:13 -07:00
Mike Place
b1f14c7518
Merge pull request #43692 from cloudflare/fix-net-runner
Addressing a bug in the network find runner
2017-11-13 12:42:24 -07:00
Mike Place
1e94a5bd5f
Merge pull request #43689 from The-Loeki/cached_pilarenv
make cached pillars use pillarenv rather than saltenv
2017-11-13 12:29:59 -07:00
Mike Place
f9b273a894
Merge pull request #43837 from twangboy/win_unit_test_archive
Fix `unit.states.test_archive` for Windows
2017-11-13 12:12:18 -07:00
Nicole Thomas
caa81728a0
Merge pull request #44507 from Ch3LL/pillar_time
Increase sleep timeout for pillar refresh test
2017-11-13 13:29:05 -05:00
Mike Place
cffea5ac71
Merge pull request #44302 from morganwillcock/badsid
Fix traceback and incorrect message when resolving an unresolvable SID
2017-11-13 11:19:00 -07:00
Mike Place
32fc952000
Merge pull request #44439 from cloudflare/fix-napalm
Adapt napalm modules to the new library structure
2017-11-13 10:43:23 -07:00
Mike Place
ebbe5949ea
Merge pull request #44457 from twangboy/win_remove_wmi_monkeypatching
Remove wmi monkeypatching
2017-11-13 10:38:51 -07:00
Nicole Thomas
1da1a97d7d
Merge pull request #44490 from Ch3LL/ssh_ping
Enable test_deploy ssh test
2017-11-13 12:12:47 -05:00
Ch3LL
ffa4bddcad
Increase sleep timeout for pillar refresh test 2017-11-13 10:50:16 -05:00
Nicole Thomas
18624d6798
Merge pull request #44491 from Ch3LL/ssh_raw
Add salt-ssh raw integration tests
2017-11-13 10:47:11 -05:00
Nicole Thomas
aa17bfa8e7
Merge pull request #44492 from twangboy/win_skip_mode_check
Fix `unit.utils.test_cloud` for Windows
2017-11-13 10:44:30 -05:00
Mircea Ulinic
f45378af04
Lint: remove extra spaces 2017-11-13 14:24:21 +00:00
Morgan Willcock
f3af106e33 Merge branch 'badsid' of https://github.com/morganwillcock/salt into badsid 2017-11-12 12:35:14 +00:00
Morgan Willcock
c7cf5f6f70 Format pywintypes.error 2017-11-12 12:33:23 +00:00
twangboy
2f30ad93b1
Skips mode check in Windows 2017-11-10 14:29:10 -07:00
Ch3LL
3dc8673417
change class name to raw 2017-11-10 14:47:42 -05:00
Ch3LL
308596ac8d
Add salt-ssh raw integration tests 2017-11-10 14:47:38 -05:00
Nicole Thomas
5b95495e75
Merge pull request #44484 from Ch3LL/orch_test
Add orchestration tests when target exists or not
2017-11-10 12:24:21 -07:00
Nicole Thomas
62c42ca6fb
Merge pull request #44480 from Ch3LL/override_pillar
Add integration pillar command line test
2017-11-10 12:14:31 -07:00
Nicole Thomas
5505a8819a
Merge branch '2017.7' into win_unit_test_archive 2017-11-10 11:48:51 -07:00
Ch3LL
e952cd6712
Enable test_deploy ssh test 2017-11-10 13:35:13 -05:00
twangboy
6c872e95e6
Add back the setup_loader_modules function
Use empty dict instead of defining wmi
2017-11-10 11:30:00 -07:00
Erik Johnson
20273e3697
No need for setup_loader_modules since we're actually importing wmi 2017-11-10 11:29:59 -07:00
twangboy
8c107873cd
Remove wmi monkeypatching
The WMI object was being monkey patched in the global namespace causing
other tests to fail
2017-11-10 11:29:54 -07:00
Mike Place
cc08ad2edc
Merge pull request #44317 from Ch3LL/ssh_test
Add state tests and state request system to salt-ssh
2017-11-10 11:28:42 -07:00
Nicole Thomas
6669035a30
Merge pull request #44478 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-11-10 11:00:55 -07:00
Mike Place
60719d0683
Merge pull request #44444 from twangboy/win_lgpo_non_zero
LGPO: Issue with Maximum Password Age
2017-11-10 10:26:53 -07:00
Ch3LL
f3ec6df76e
Add orchestration tests when target exists or not 2017-11-10 12:00:12 -05:00
Ch3LL
46bce3bd5e
add additional parser argument for ssh integration tests 2017-11-10 10:58:38 -05:00
Ch3LL
e9231430b5
remove logic similar to cloud/proxy tests 2017-11-10 10:48:31 -05:00
Ch3LL
c731eb8ea6
add ssh dir to test runner when --ssh-tests set 2017-11-10 10:48:31 -05:00
Ch3LL
8089a885c2
add wipe function to other run_ssh method 2017-11-10 10:48:31 -05:00
Ch3LL
200b12ae6a
change versionadded salt version 2017-11-10 10:48:31 -05:00
Ch3LL
e3ebb5e9b3
fix comment and variables 2017-11-10 10:48:30 -05:00
Ch3LL
faef0886a7
Add state tests and state request system to salt-ssh 2017-11-10 10:48:30 -05:00
Ch3LL
12fed1b4d8
Add integration pillar command line test 2017-11-10 10:43:37 -05:00
rallytime
9fcc2a70b5
Merge branch '2016.11' into '2017.7'
Conflicts:
  - tests/unit/modules/test_rh_ip.py
2017-11-10 10:33:25 -05:00
Nicole Thomas
4f3a79df07
Merge pull request #44467 from twangboy/win_fix_test_doc
Fix `unit.test_doc` for Windows
2017-11-10 08:21:57 -07:00
twangboy
0a9e862bf4
Use regex to split 2017-11-09 16:24:19 -07:00
twangboy
b1dfe9c3c8
Format patching with statements for easier reading 2017-11-09 14:32:21 -07:00
twangboy
ba2f2eb788
Add Erik's changes 2017-11-09 14:32:21 -07:00
twangboy
4ef1e3eb97
Fix unit.states.test_archive for Windows
Use os agnostic paths
Mock `salt.utils.which` for Windows
Handle urlparse return on Windows
2017-11-09 14:32:21 -07:00
twangboy
de6b394445
Remove unneeded functions 2017-11-09 14:16:08 -07:00
twangboy
ee0914f7e9
Fix some lint, remove unnecessary function 2017-11-09 14:16:08 -07:00
twangboy
d52a7c12db
Fix typo in PasswordComplexity policy 2017-11-09 14:16:08 -07:00