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
3335fcbc7d
Merge pull request #41557 from dmurphy18/fix-proxy-service
...
Add symbolic link for salt-proxy service similar to other serivce files
2017-06-06 10:13:51 -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
Daniel Wallace
53d0098f47
load source files as binary
...
If we load them as text on a system without an locale setup, (so it defaults to
C or POSIX), then no modules/states with unicode in the documentation can be
loaded.
2017-06-06 10:35:38 -06:00
Mircea Ulinic
564f2d1e3d
Indent correctly the code block
2017-06-06 15:23:14 +00:00
Ch3LL
8d27bb31b2
Disable home dir check for mac in more test_user tests
2017-06-06 11:20:18 -04:00
Nicole Thomas
65ed230f45
Merge pull request #41597 from rallytime/bp-41533
...
Back-port #41533 to 2016.11
2017-06-06 09:15:09 -06:00
Mircea Ulinic
b70df6e576
Reference new Jinja filters in the release notes
2017-06-06 15:15:06 +00:00
Mircea Ulinic
406e582479
Small adjustment
2017-06-06 15:14:47 +00:00
rallytime
27892a85c7
Lint fix
2017-06-06 09:12:14 -06:00
Mircea Ulinic
62cb2a1c7a
More jinja references
2017-06-06 15:05:50 +00:00
Ch3LL
85e77c9cc8
Disable home dir check for mac in test_user
2017-06-06 11:02:19 -04:00
Mircea Ulinic
bba8c27873
Restructure the Jinja topic to have refrences
2017-06-06 14:56:21 +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
Mircea Ulinic
2a8c5cef04
Add notes regarding other new features
2017-06-06 14:18:01 +00:00
Mircea Ulinic
b59760fae2
Fix indentation for better display
2017-06-06 13:52:01 +00:00
Mircea Ulinic
ad4e6e5ec5
salt.beacons.log instead of 'Log'
2017-06-06 13:46:38 +00:00
Mircea Ulinic
36985bb1ed
Remove service state, not a new one
2017-06-06 13:45:02 +00:00
Mircea Ulinic
b6b6a51846
Index new modules introduced in Nitrogen
2017-06-06 13:41:32 +00: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
Mircea Ulinic
5365196920
Add note for the mine.update runner
2017-06-06 12:55:47 +00:00
Mircea Ulinic
6b1b05129c
Remove the reference to the profile outputter
2017-06-06 12:49:04 +00: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
Gareth J. Greenaway
66a136e6d8
Fixing issues raised in #41540 when a zip file is created on a Windows system. The issue has two parts, first directories that end up in the archive end up in the results of aarchive.list twice as they show up as both files and directories because of the logic to handle the fact that Windows doesn't mark them as directories. This issue shows up when an extraction is run a second time since the module verified the file types and the subdirectory is not a file. The second issue is related to permissions, if Salt is told to extract permissions (which is the default) then the directory and files end up being unreadable since the permissions are not available. This change sets the permissions to what the default umask for the user running Salt is.
2017-06-05 20:54:05 -07:00
rallytime
ce7880d9fc
Fix vultr cloud driver to work with Python 3
...
The driver was using the python2 version of urllib.urlencode(), which
was moved in Python3. This change uses the six library to handle both
Python version uses.
2017-06-05 21:53:58 -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
rallytime
535b8e8d8e
Update new pyroute2 unit test to conform with 2016.11 branch standards
2017-06-05 20:55:44 -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
bf8aed153d
Merge pull request #41596 from rallytime/bp-41487
...
Back-port #41487 to 2016.11
2017-06-05 20:44:17 -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
19ea5481b6
remove test that never passed
2017-06-05 17:45:23 -06: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
Peter V. Saveliev
5c86dee73c
unit tests: test_pyroute2 -- add skipIf
...
... and comments
Bug-Url: https://github.com/saltstack/salt/pull/41533
2017-06-05 17:22:48 -06:00
Peter V. Saveliev
026b39493f
unit tests: add encoding clause into test_pyroute2
...
Bug-Url: https://github.com/saltstack/salt/pull/41533
2017-06-05 17:22:48 -06:00
Peter V. Saveliev
9ab203d54b
unit tests: fix absolute imports in test_pyroute2
...
Bug-Url: https://github.com/saltstack/salt/pull/41533
2017-06-05 17:22:48 -06:00
Peter V. Saveliev
1f507cfa7a
unit tests: add pyroute2 interface dict test
...
Bug-Url: https://github.com/saltstack/salt/pull/41487
Bug-Url: https://github.com/saltstack/salt/issues/41461
2017-06-05 17:22:48 -06:00
Peter V. Saveliev
7b497d9ec6
clean up change
attribute from interface dict
...
The attribute is hidden in IPDB from the high-level logics since
pyroute2 version 0.4.2.
Bug-Url: https://github.com/saltstack/salt/issues/41461
2017-06-05 17:21:41 -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
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
Mircea Ulinic
536a6291d4
Add enabling note for the host_dns grain
2017-06-05 09:19:11 +00:00