Commit Graph

82667 Commits

Author SHA1 Message Date
Mike Place
bc0f9699ca Merge pull request #41613 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-06-06 17:39:54 -05:00
Mike Place
c7f60312c8 Merge pull request #41591 from FireEater64/add-choco-no-progress-option
Choco: Add support for the --no-progress option
2017-06-06 17:30:53 -05:00
Mike Place
20c54a984b Merge pull request #40694 from xetus-oss/boto_ec2_volume_present
Boto ec2 volume present
2017-06-06 16:03:25 -05:00
Mike Place
979f121791 Merge pull request #41575 from dschaller/fix-41562
Fix 41562
2017-06-06 16:00:46 -05:00
rallytime
2cb4f2baa9 Merge branch 'nitrogen' into 'develop'
Conflicts:
  - salt/states/keystone.py
2017-06-06 12:50:35 -06:00
garethgreenaway
2fc700accf Merge branch 'develop' into fix-41562 2017-06-06 11:47:00 -07:00
Mike Place
936484026b Merge pull request #41543 from cri-epita/develop
Fix user creation with empty password
2017-06-06 13:27:16 -05:00
Mike Place
53ecb5c4b0 Merge pull request #41553 from terminalmage/issue41527
Fix installing RPMs via remote URLS which are 30x redirects
2017-06-06 13:23:41 -05:00
Mike Place
36b2eee8f7 Merge pull request #41554 from KevinPlus3/add_chattr
Add chattr functionality.
2017-06-06 13:22:37 -05:00
garethgreenaway
b260b5f380 Merge branch 'develop' into add-choco-no-progress-option 2017-06-06 10:30:05 -07:00
garethgreenaway
adf249eb74 Merge branch 'develop' into boto_ec2_volume_present 2017-06-06 10:28:14 -07:00
garethgreenaway
bd6af111e3 Merge pull request #41608 from Ch3LL/fix_mac_user_test
Disable home dir check for mac in test_user
2017-06-06 10:25:49 -07:00
Mike Place
420c0bd338 Merge pull request #41610 from terminalmage/py3-tests
Even more debug logging for manage runner tests
2017-06-06 12:15:42 -05:00
Erik Johnson
8d85d7a898 Even more debug logging for manage runner tests
This will show whether or not the test.ping was actually received by the
minion, and whether or not the minion attempted to send the return back
to the master.
2017-06-06 12:14:08 -05:00
garethgreenaway
f6bd970ce6 Merge branch 'develop' into develop 2017-06-06 10:09:13 -07:00
garethgreenaway
872ba1f8ed Merge branch 'develop' into add_chattr 2017-06-06 10:07:25 -07:00
garethgreenaway
0685d72e3a Merge pull request #41601 from rallytime/remove_urlencode
[PY3] Remove uses of urllib.urlencode for PY3 - use six instead
2017-06-06 10:05:53 -07:00
Ch3LL
8d27bb31b2
Disable home dir check for mac in more test_user tests 2017-06-06 11:20:18 -04:00
Nicole Thomas
bd767f77f9 Merge pull request #41588 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-06-06 09:08:22 -06:00
Ch3LL
85e77c9cc8
Disable home dir check for mac in test_user 2017-06-06 11:02:19 -04:00
Nicolas Geniteau
f7bf038a91 Fix user creation with empty password
Emptying the password was only done if the user already existed, not
when creating.

Signed-off-by: Nicolas Geniteau <nicolas@cri.epita.net>
2017-06-06 14:51:08 +00:00
Erik Johnson
4607c7b7cc Merge pull request #41606 from terminalmage/py3-tests
Modify debug logging for manage runner troubleshooting
2017-06-06 09:34:15 -05:00
Erik Johnson
7d7d8bb0fe Modify debug logging for manage runner troubleshooting 2017-06-06 08:18:53 -05:00
Erik Johnson
92539e9ff3 Revert "More debug logging to troubleshoot failing manage runner tests in Python 3"
This reverts commit e0f00a2f84.
2017-06-06 08:18:07 -05:00
George Vanburgh
8cb12a4c04 Choco: Add support for the --no-progress option
Chocolatey added support for the --no-progress option in 0.10.4. This
option is super useful when calling chocolatey from automation tools
like Salt - as it can dramatically reduce the amount of output when
running certain commands (install, upgrade etc.). This is particularly
noticable when running commands which target a large number of packages,
for example when upgrading all the packages on a system.

Because this feature was only added in chocolatey 0.10.4 - we guard
against execution on previous versions of chocolatey using the same
pattern as the --yes flag.
2017-06-06 09:17:46 +01:00
rallytime
c4c7d6d2c3 [PY3] Remove uses of urllib.urlencode for PY3 - use six instead
Similar to the changes made for the vultr driver in PR #41600, we need
to be using the urlencode version from the six library instead of the
urllibe.urlencode function. The urlencode function was moved in PY3.

This PR removes the remaining instances of urllib.urlencode in the
salt directory.
2017-06-05 22:03:38 -06:00
Nicole Thomas
5153606468 Merge pull request #41598 from gtmanfred/nitrogen
remove unicode from engines loading in test suite
2017-06-05 21:33:11 -06:00
Daniel Wallace
fe149baecd remove unicode from engines loading in test suite 2017-06-05 20:47:56 -06:00
Nicole Thomas
ebfc9f214a Merge pull request #41594 from Ch3LL/fix_mac_check_cmd
change group to wheel for macosx in tests
2017-06-05 20:45:02 -06:00
Nicole Thomas
be0683de78 Merge pull request #41595 from gtmanfred/nitrogen
Make sure runtests_engine is ASCII text
2017-06-05 20:43:50 -06:00
Nicole Thomas
fa9d7015ca Merge pull request #41589 from Ch3LL/fix_locale_map
Skip locale tests on MacOSX
2017-06-05 20:42:48 -06:00
Mike Place
d7fe4ba7a9 Merge pull request #41592 from terminalmage/py3-tests
Kill child PIDs when shutting down a testprogram daemon
2017-06-05 19:01:49 -05:00
Daniel Wallace
f309bae8b4 Make sure runtests_engine is ASCII text
If this is has any unicode characters in it, it won't load on systems that do
not default to a unicode locale.

find . -type f | while read line; do ret=$(file $line); if [[ $ret == *UTF-8* && $line == *.py ]]; then echo $line; fi; done

The above will list all files that have unicode characters in it and won't load
with locale set to C or POSIX
2017-06-05 17:30:28 -06:00
Nicole Thomas
b59a5a236d Merge pull request #41587 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-06-05 17:19:56 -06:00
Erik Johnson
8e380679cc Kill child PIDs when shutting down a testprogram daemon
This fixes the test failures recently observed in
integration.shell.test_master.MasterTest.test_exit_status_correct_usage.
The test failures were not a regression, but rather a symptom of a
greater problem with the TestProgram class' shutdown() func. When
terminating the process using the terminate_process helper from
pytest-salt, it does not pass kill_children, which defaults to False.
This makes the helper only kill the main PID, leaving all the other PIDs
running.

This means that every time the integration suite was being run, each
time the TestProgram class was used to spawn a temporary daemon, it
would leave all the child PIDs running when the shutdown() is invoked.

By passing kill_children=True, we ensure that the child PIDs are also
killed. This should provide a significant perfomance improvement in the
test suite.
2017-06-05 16:38:23 -05:00
Ch3LL
ddcb1ca9a7
change group to wheel for macosx in tests 2017-06-05 17:16:54 -04:00
Ch3LL
8c10cbd01d
Skip locale tests on MacOSX 2017-06-05 15:57:20 -04:00
rallytime
9e05c1cd06 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-06-05 13:39:01 -06:00
rallytime
903e2f9922 Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-06-05 13:38:51 -06:00
Mike Place
d31e687c79 Merge pull request #41582 from terminalmage/py3-tests
More debug logging to troubleshoot failing manage runner tests in Python 3
2017-06-05 12:11:10 -05:00
Erik Johnson
e0f00a2f84 More debug logging to troubleshoot failing manage runner tests in Python 3
Either the get_cli_event_returns generator is not returning events, or
the events being yielded otherwise are evaluating as False. This line of
debugging code will help determine which is the case.
2017-06-05 11:14:21 -05:00
Derek Schaller
de956977cd only list top level npm modules during {un)install 2017-06-04 22:44:54 -07:00
Nicole Thomas
5234ff2f87 Merge pull request #41550 from cloudflare/empty-pass
More flexible options for the napalm proxy
2017-06-02 21:11:37 -06:00
Nicole Thomas
1b5d69365f Merge pull request #41542 from rongzeng54/develop
fixed salt-minion initd file bug
2017-06-02 21:09:49 -06:00
Nicole Thomas
cc6c98a8d8 Merge pull request #41509 from seanjnkns/fix-keystone-v3-endpoint_present
Add keystone V3 API support for keystone.endpoint_present|absent
2017-06-02 21:01:05 -06:00
freckledkev
a3a6085629 Adding lsattr/chattr functionality to Salt. 2017-06-02 21:42:52 +00:00
Erik Johnson
14ac8fc271 Fix wording in comment 2017-06-02 14:26:29 -05:00
Mike Place
da8af9ca34 Merge pull request #41483 from tsaridas/clean_job_cache
clear jobs directories
2017-06-02 12:29:05 -05:00
Mike Place
310184a549 Merge pull request #41505 from coredumb/vault_support_minion_id
salt/pillar/vault.py: Support having minion_id in vault path
2017-06-02 12:26:21 -05:00
Nicole Thomas
706d3ccf69 Merge pull request #41560 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-06-02 11:19:05 -06:00