Commit Graph

81739 Commits

Author SHA1 Message Date
Mircea Ulinic
b6b6a51846 Index new modules introduced in Nitrogen 2017-06-06 13:41:32 +00: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
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
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
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
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
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
Mike Place
0a08649637 Merge pull request #41539 from gtmanfred/x509
allow digest to be empty in create_crl
2017-06-02 12:00:03 -05:00
Mike Place
33819e9476 Merge pull request #41544 from cloudflare/reconnect-on-err
Reconnect and re-execute when receiving disconnect
2017-06-02 11:34:55 -05:00
Mike Place
e97998fa52 Merge pull request #41564 from terminalmage/py3-tests
Add debug logging for manage.up/down
2017-06-02 11:20:01 -05:00
Erik Johnson
896a583f83 Add debug logging for manage.up/down
This adds some debug logging which we can hopefully use to troubleshoot
https://github.com/saltstack/salt-jenkins/issues/341.

Also, this ensures that the lists of up/down minions are always sorted.
This will make future testing more reliable.
2017-06-02 11:14:45 -05:00
Mike Place
3ae8336895 Merge pull request #41561 from terminalmage/issue41154
Redact HTTP basic authentication in archive.extracted
2017-06-02 10:33:13 -05:00
Mike Place
0386ce968d Merge pull request #41558 from rallytime/salt-cloud-py3
Various Python 3 fixes for salt-cloud
2017-06-02 10:28:10 -05:00
rallytime
c617dc0248 Remove duplicate tearDown test functions in tcp unit test 2017-06-02 09:05:29 -06:00
Erik Johnson
cbf8acbafc Redact HTTP basic authentication in archive.extracted 2017-06-02 01:12:08 -05:00
rallytime
cf988e7ad4 Pylint fix 2017-06-01 17:46:44 -06:00
Nicole Thomas
8718033171 Merge pull request #41532 from wasabi222/patch-3
change default skip_verify to False
2017-06-01 17:40:58 -06:00
rallytime
80896a785a Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-06-01 17:15:47 -06:00
Nicole Thomas
ae2ce3f818 Merge pull request #41515 from twangboy/fix_win_file
Fix makedirs_ function
2017-06-01 17:10:39 -06:00
rallytime
0c19cab2a1 Fix hexdigest call to use salt's PY3 compatible hash util in gogrid driver 2017-06-01 16:43:50 -06:00
rallytime
d9d07a817d Fix some more places where .keys() is being used improperly for PY3
The .keys() function itself is fine, it's just what we do after calling
it that matters. Anywhere we try to index the dictionary view will
stacktrace in PY3.
2017-06-01 16:33:41 -06:00
Nicole Thomas
a49348cc89 Merge pull request #41535 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-06-01 16:25:35 -06:00
rallytime
655e5fa1d3 Pass in a list as final arg to cloud.filter_event utils call
The third argument that is passed to the salt.utils.cloud.filter_event
function is supposed to be a list. Most of the places calling this function
were using `foo.keys()`, which returns a list in PY2. But, in PY3, this
is a dictionary view.

This change updates the places where `filter_event` is using `.keys()` and
instead wraps the dict with list(). It also adds some extra type checking
in the filter_event function in case a list is not passed in.
2017-06-01 12:50:42 -06:00
Mike Place
39840bfe4e Merge pull request #41436 from skizunov/develop2
TCP transport: Fix occasional errors when using salt command
2017-06-01 11:37:42 -05:00
rallytime
cb69296f55 Remove test_win_firewall unit tests: they don't actually test anything 2017-06-01 10:07:23 -06:00
Nicole Thomas
5295ff2a50 Merge pull request #41526 from DSRCorporation/bugs/py3_tests_nitrogen
Py3 related tests and code fixes
2017-06-01 09:16:43 -06:00
Mike Place
5eec523ef8 Merge pull request #41528 from wasabi222/patch-1
default skip_verify to False
2017-06-01 09:57:58 -05:00
Mike Place
77420c5c57 Merge pull request #41541 from twangboy/fix_salt-proxy
Fix salt-proxy on Py2
2017-06-01 09:54:42 -05:00
Dmitry Kuzmenko
7ba25db473 Replace assertCountEqual not-implemented in Py2 2017-06-01 16:52:09 +03:00
Dmitry Kuzmenko
64954d8e40 Fixed pylint errors. 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
2ae68ee591 Added cache test.
Implemented some time ago, but forgotten.
2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
4a2406f178 Py3: fixed some tests.
tls module: convert bytes to string
gzip util: use BytesIO for 'wb' file
django module: ignore arguments order in assert
pillar module: correctly test pillar merge
2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
fef0e0ea67 Catch errors on socket.shutdown.
It throws an exception if the socket wasn't connected.
2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
2b3276077c Py3: Fixed schema serialization. Enabled tests back. 2017-06-01 16:49:49 +03:00
Mircea Ulinic
4dbf77b926 More flexible options for the napalm proxy 2017-06-01 13:31:10 +00:00
Mircea Ulinic
ea22e70260 Reconnect and re-execute when receiving disconnect
Having always alive sessions introduces many issues
when working with legacy equipment. One of them
being that the device can decide by itself to kill
the connection, the sole reasons being lack of activity
on the CLI. (Especially when working with ancient
operating systems such Cisco IOS).
In that case, whenever we detect that the connection
was dropped, we'll try re-establishing the connection.
But it won't go through a loop, will try just once,
if still unable to execute anything, will fail loudly.
When working with SSH-based drivers, the Paramiko
is_alive flag doesn't help much, as the dumb device
doesn't close the connection properly.
2017-06-01 09:57:55 +00:00
twangboy
5743394668 Use six.string_type instead of str
Use six.string_type instead of string_type
Use six.text_type instead of text_type
Remove from salt.ext.six import string_types, text_type
2017-05-31 19:18:40 -06:00