Commit Graph

8123 Commits

Author SHA1 Message Date
Mike Place
6725cd458c Merge pull request #35156 from twangboy/int_states_file
Fix integration tests for file state on Windows
2016-08-30 17:45:17 +09:00
Mike Place
353d4b70eb Merge pull request #35180 from twangboy/int_states_cmd
Fix integration tests for cmd state on Windows
2016-08-30 17:44:04 +09:00
Mike Place
cbf927ea7a Merge pull request #35703 from s0undt3ch/develop
Signal handling improvements
2016-08-30 17:37:01 +09:00
Mike Place
83cd956b7b Merge pull request #35845 from m03/dry-and-more-iis-unit-tests
Additional win_iis unit tests and DRY
2016-08-30 16:20:51 +09:00
Justin Anderson
e744b795d1 Make ddns_test happy with py3 and py26 (#35857)
* Make python3 and python26 happy

* Don't need both ways of nesting with statements

* No longer need pylint disable

* Lint fix

* take out the correct import
2016-08-29 16:33:54 -06:00
twangboy
f1bb655e82 Use returns instead of elses 2016-08-29 16:25:29 -06:00
twangboy
f5e0398cc0 Remove skipIf decorator 2016-08-29 16:13:41 -06:00
Justin Anderson
3f7e4d9f59 traversal_spec has skip=True, not false (#35877) 2016-08-29 16:12:16 -06:00
twangboy
1f7c4e2a32 Fix other mode tests for Windows 2016-08-29 16:12:06 -06:00
twangboy
ecd58bab06 Fix key error 2016-08-29 16:03:00 -06:00
twangboy
9be5d83a25 fix managed_file_mode test 2016-08-29 15:59:17 -06:00
twangboy
566d9b4982 Close file properly 2016-08-29 15:29:47 -06:00
twangboy
b7263d24b5 Additional cachedout recommendations 2016-08-29 15:22:17 -06:00
Erik Johnson
16453e35f0 Fix legacy git_pillar tests (#35713)
* Add debug logging to legacy git_pillar tests

This is to aid in troubleshooting some failures on the branch builds

* Reverse monkey-patching after test completes

* Fix misspelling in git_pillar unit tests

* Ensure 2nd repo is updated

* Add logging for legacy git_pillar checkout func

* Explicitly set hash_type in opts for git_pillar tests

* Do not use dict.get() to get hash_type

This code is a relic from before we set a default value for this in
salt.config. There is no expectation that this value will be unset, so
there is no need to use dict.get() here.
2016-08-29 14:58:31 -06:00
twangboy
97f3c1fa71 Add missing import 2016-08-29 14:53:41 -06:00
twangboy
9dfa523cc0 Fix test_symlink for Windows 2016-08-29 14:53:41 -06:00
twangboy
aca27acc9b Fix test_template_local_file and _noclobber 2016-08-29 14:53:41 -06:00
twangboy
31c983fac5 Fix test_template_local_file_noclobber for Windows 2016-08-29 14:53:41 -06:00
twangboy
a37f250460 Fix a few more tests for Windows 2016-08-29 14:53:41 -06:00
twangboy
85fc2f1adc Fix test_absent_link, test_managed_contents 2016-08-29 14:53:41 -06:00
twangboy
aafe1aff38 Create missing source for symlink on windows 2016-08-29 14:53:41 -06:00
twangboy
c9acbfee38 Fix jinja 2016-08-29 14:53:41 -06:00
twangboy
cd2ce9fb01 Use Jinja instead of seperate files 2016-08-29 14:53:41 -06:00
twangboy
ba2047e37b Fix a few more tests 2016-08-29 14:53:41 -06:00
twangboy
64ca61065d Use IS_WINDOWS instead of salt.utils.is_windows 2016-08-29 14:53:41 -06:00
twangboy
b647630dd3 Add missing @ on decorators 2016-08-29 14:53:41 -06:00
twangboy
56180cf09d Fix/Skip tests for windows 2016-08-29 14:53:41 -06:00
twangboy
4d4ffac5ae Gate stuff that makes windows crash 2016-08-29 14:53:41 -06:00
Nicole Thomas
27697e952a Pylint fixes for develop branch (#35863) 2016-08-29 12:20:50 -06:00
Justin Anderson
ab7e511fd1 Change osmajorrelease back to str (#35858) 2016-08-29 11:24:20 -06:00
Mike Place
9aea24aa47 Fixed a bug in windows hostname settings when the hostname is longer than 15 chars (#35848)
- The previous implementation was limited to the 15 char limit for "Computernames" which would cause the state to always fail if the hostname was longer
2016-08-29 10:09:53 -06:00
mwinnett
f48ebd082f DRY, additional win_iis unit tests 2016-08-28 23:42:53 -07:00
Mike Place
409f17aa58 Merge pull request #35673 from cro/proxy_getsi_fix
Proxies don't handle reusing the SmartConnect instances very well.  D…
2016-08-29 13:11:35 +09:00
Mike Place
5bb62345f6 Merge pull request #35728 from alexbleotu/vmware_enhancements-gh
Vmware enhancements gh
2016-08-29 12:54:14 +09:00
Mike Place
51b304f4a8 Merge pull request #35757 from vutny/grains-filterby-wildcard
grains.filter_by: lookup_dict key could be a globing pattern
2016-08-29 12:23:05 +09:00
Mike Place
202d9adf2e Merge pull request #35778 from kraney/boto_cloudwatch_event
Boto cloudwatch event
2016-08-29 11:20:47 +09:00
Mike Place
f6b31be592 Lint 2016-08-29 10:18:52 +09:00
Tarjei Husøy
8d2d20903d Ensure ssh keys are decodable before inserting
Closes #35631.
2016-08-28 11:45:41 -07:00
rallytime
2b1ad9e9b9 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/utils/gitfs.py
2016-08-26 14:54:54 -06:00
rallytime
e8e73b55ac Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/jobs/schedule.rst
  - salt/states/user.py
2016-08-26 13:21:12 -06:00
David Boucha
822b0a0f33 Don't test for linux shells on Windows (#35743)
* Don't test for linux shells on Windows

* Don't force windows to be false

Salt didn't used to support runas on Windows.
Salt now supports runas on Windows. This line was causing the wrong code
paths to be followed.

* Skip test on windows because no VT on windows

* add missing closing paren
2016-08-26 12:52:39 -06:00
Hengyang Hu
b89f45598e fix 34241, webutil.useradd_all is deprecated (#35788)
* fix 34241, webutil.useradd_all is deprecated

* in src webutil.useradd_all get replaced by webutil.useradd, change the mocks accordingly
2016-08-26 12:52:11 -06:00
Erik Johnson
eb4d2f299b Better unicode handling in gitfs (#35802)
* Revert "Don't use six.text_type() in salt.utils.gitfs"

This reverts commit d76659a63a.

* salt.utils.path_join: handle mixed unicode/binary-unicode paths

* Add test for mixed unicode and binary-unicode paths

* salt.utils.gitfs: replace os.path.join with salt.utils.path_join
2016-08-26 10:44:22 -06:00
Kris Raney
9b3e48bd6e Fix pylint warnings in test code 2016-08-25 15:51:02 -05:00
Kris Raney
170e8238c8 Add cloud watch events unit tests 2016-08-25 13:30:56 -05:00
rallytime
381debe53b Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
2016-08-25 10:14:38 -06:00
Thomas S Hatch
b3f6367621 Merge pull request #35753 from rallytime/fix-client-unit-test
Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720
2016-08-25 09:55:23 -06:00
rallytime
92f8c836e8 Add cmd_mock back in to function spec 2016-08-25 07:05:52 -06:00
Alexandru Bleotu
e993f99053 Improved salt.utils.vmware.get_content, get_mors_with_properties
- added optional traversal_spec parameter to both methods, allowing the
  user to specify a different TraversalSpec object to search for content
  (if not specified, the behaviour is that all a traverse all search is
  done)
- the traversal_spec is destroyed only if is created in the method
- added local_properties flag to both methods allowing the retrieval of
  properties of the container object
- added tests for the 2 functions
2016-08-25 10:42:48 +01:00
rallytime
a671f0a092 Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720
Refs #35720
2016-08-24 17:48:45 -06:00