Ch3LL
178dab3a4b
Merge branch 2017.7 into 2018.3
...
Conflicts:
- doc/topics/tutorials/salt_bootstrap.rst
- tests/integration/cloud/clouds/test_digitalocean.py
2018-11-14 10:33:44 -05:00
twangboy
60559cfa8a
Remove flaky test
2018-11-13 09:25:47 -05:00
twangboy
a696a8f564
Fix test_matcher on Windows
...
Fixes a timeout issue in test_salt_documentation_arguments_not_assumed
2018-11-13 09:25:41 -05:00
Erik Johnson
186d333c92
Add back changes lost in cherry-pick
2018-10-23 14:46:05 -05:00
Daniel A. Wozniak
8bfa634f3c
Fix warts in integration.shell.test_matcher
2018-10-03 18:43:44 -07:00
Daniel A. Wozniak
45d2142c7d
Fix wart in test_cp module
2018-10-03 18:43:43 -07:00
Daniel A. Wozniak
0e4fbc5b50
Add syndic tests to whitelist.txt for Windows
2018-10-03 18:43:43 -07:00
Daniel A. Wozniak
02ad722e02
Add more shell integration tests to whitelist
2018-10-03 18:43:43 -07:00
Daniel Wozniak
48275c0072
Add shell.test_key to whitelist and fix wart
2018-10-03 18:43:43 -07:00
Daniel Wozniak
e5edff4154
Skip tests not valid on windows
2018-10-03 18:43:42 -07:00
Daniel Wozniak
a3897290e8
Add shell cp tests and fix them
2018-10-03 18:43:42 -07:00
Daniel A Wozniak
7c7353c5f6
Add more tests to whitelist
2018-09-19 11:21:10 -06:00
rallytime
accef8c7dd
Skip some unreliable tests
...
We need to investigate these more in the future, but let's skip them for now
so we can see some better signaling.
2018-09-13 10:33:59 -04:00
rallytime
8e74d1c9e4
Skip some unreliable tests
...
We need to investigate these more in the future, but let's skip them for now
so we can see some better signaling.
2018-09-13 10:31:08 -04:00
Nicole Thomas
68d630f872
Merge pull request #49401 from rallytime/flaky-output-test
...
Mark output file permissions test as flaky
2018-08-29 14:13:11 -04:00
rallytime
e13216ba86
Mark output file permissions test as flaky
2018-08-29 11:36:24 -04:00
rallytime
ac406c49a7
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/ext/win_inet_pton.py
- salt/pillar/git_pillar.py
- tests/integration/cli/test_batch.py
- tests/integration/modules/test_archive.py
- tests/integration/modules/test_pkg.py
- tests/integration/states/test_file.py
- tests/support/case.py
- tests/whitelist.txt
2018-08-28 11:22:47 -04:00
Daniel Wozniak
d8f2945813
Merge pull request #49344 from cachedout/test_matcher_flaky
...
Matcher test marked flaky
2018-08-27 18:50:35 -07:00
Mike Place
a34ef2e54d
Matcher test marked flaky
2018-08-27 10:56:55 -06:00
Daniel Wallace
41973ff6c0
flaky tests are flaky yo
2018-08-22 11:38:48 -05:00
Daniel Wallace
93a576ef63
flaky tests are flaky yo
2018-08-22 11:38:23 -05:00
rallytime
3e6445a9d6
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/man/salt-api.1
- doc/man/salt-call.1
- doc/man/salt-cloud.1
- doc/man/salt-cp.1
- doc/man/salt-key.1
- doc/man/salt-master.1
- doc/man/salt-minion.1
- doc/man/salt-proxy.1
- doc/man/salt-run.1
- doc/man/salt-ssh.1
- doc/man/salt-syndic.1
- doc/man/salt-unity.1
- doc/man/salt.1
- doc/man/salt.7
- doc/man/spm.1
- salt/beacons/log.py
- salt/client/ssh/__init__.py
- salt/modules/cmdmod.py
- salt/utils/win_functions.py
- tests/integration/modules/test_cmdmod.py
- tests/integration/netapi/rest_tornado/test_app.py
- tests/integration/runners/test_state.py
2018-08-08 13:31:57 -04:00
rallytime
e7e5abcf48
Mark 2 matcher tests as flaky
2018-08-06 14:47:44 -04:00
rallytime
668da57ab9
Mark some shell and runner integration tests as flaky
...
In addition to marking these tests as flaky, the commit also updates
the affected tests to use pytest notation instead of unittest notation.
2018-08-05 16:19:29 -04:00
rallytime
b3a5aa49d7
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- tests/integration/modules/test_shadow.py
- tests/integration/netapi/rest_tornado/test_app.py
2018-08-02 15:45:36 -04:00
rallytime
3660dff13c
Separate compound matcher tests into individual tests
...
When one match fails (and some of these can be flaky) the whole test fails.
This makes it somewhat difficult to track down why the test fails.
I am hoping we won't need the sleeps in this change when the tests are separate,
but let's see how that goes. It worked fine in my testing.
I also updated the test to use pytest notation, rather than unittest.
2018-08-02 10:42:03 -04:00
rallytime
15bfba7143
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/modules/slsutil.py
- salt/modules/win_timezone.py
- salt/states/pkg.py
- tests/integration/states/test_pkg.py
2018-07-31 18:18:58 -04:00
rallytime
3c33ee554a
Skip tests in integration.shell.test_master
...
Related to https://github.com/saltstack/salt-jenkins/issues/378
This is likely causing all of the flakiness we're seeing on test runs
when the master stops responding.
These tests should be in their own, isolated run, rather than with
the rest of the test suite.
2018-07-31 15:22:34 -04:00
Alexey Aksenov
9ed2d2ec55
Fix integration.shell.test_key and integration.shell.test_runner
2018-06-18 17:39:35 +03:00
Alexey Aksenov
26a6f79730
Fix integration tests test_list_acc_wrong_eauth, test_salt_run_with_wrong_eauth
2018-06-18 17:39:23 +03:00
Erik Johnson
b33a0b5eaa
Switch to trace level logging for further test failure troubleshooting
2018-06-08 17:06:49 -05:00
Erik Johnson
41e5a75027
Add catch_timeout to run_script
...
One of the tests depends on forcing a timeout, but since we no longer
include the timeout message in the stdout/stderr return, we needed a way
to return whether or not the script timed out.
2018-06-06 09:04:09 -05:00
Nicole Thomas
a46e42ab11
Merge pull request #47927 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-06-04 14:55:11 -04:00
Erik Johnson
9c369c6aa8
Remove temp logging from test
...
It's now being logged in run_script itself
2018-06-04 00:19:30 -05:00
Erik Johnson
fb66368af9
Update test logging for salt-jenkins 1000
2018-06-02 21:39:17 -05:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/ref/configuration/master.rst
- doc/ref/modules/all/index.rst
- doc/topics/grains/index.rst
- doc/topics/releases/2016.3.4.rst
- doc/topics/spm/spm_formula.rst
- doc/topics/tutorials/cron.rst
- doc/topics/tutorials/index.rst
- doc/topics/tutorials/stormpath.rst
- salt/engines/slack.py
- salt/log/handlers/fluent_mod.py
- salt/modules/cyg.py
- salt/modules/junos.py
- salt/modules/namecheap_dns.py
- salt/modules/namecheap_domains.py
- salt/modules/namecheap_ns.py
- salt/modules/namecheap_ssl.py
- salt/modules/namecheap_users.py
- salt/modules/reg.py
- salt/modules/tomcat.py
- salt/modules/vault.py
- salt/modules/win_file.py
- salt/modules/zpool.py
- salt/output/highstate.py
- salt/renderers/pass.py
- salt/runners/cache.py
- salt/states/boto_apigateway.py
- salt/states/boto_iam.py
- salt/states/boto_route53.py
- salt/states/msteams.py
- salt/states/reg.py
- salt/states/win_iis.py
- tests/integration/modules/test_cmdmod.py
- tests/integration/states/test_user.py
- tests/support/helpers.py
- tests/unit/cloud/clouds/test_openstack.py
- tests/unit/fileserver/test_gitfs.py
- tests/unit/modules/test_junos.py
- tests/unit/pillar/test_git.py
- tests/unit/states/test_win_path.py
- tests/unit/test_pillar.py
- tests/unit/utils/test_format_call.py
- tests/unit/utils/test_utils.py
- tests/unit/utils/test_warnings.py
2018-06-01 14:54:12 -04:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings
...
Well, all but one, which we expect to see
2018-05-31 15:28:25 -05:00
Erik Johnson
25afc932f7
WIP salt-jenkins issue 1000
...
This adds logging of the output and retcode when the output file fails
to be created. As I have thus far been unable to reproduce this locally,
this is the best shot at seeing what is causing the issue, since
ShellCase's run_script is rather opaque about what happens in the script
itself. We do know from the salt-runtests.log that the `salt-call -g` is
successfully returning, what we don't know is what happened after that
data was returned, and this should provide that insight.
2018-05-30 11:40:51 -05:00
rallytime
dd3e6f3f0a
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/man/salt-api.1
- doc/man/salt-call.1
- doc/man/salt-cloud.1
- doc/man/salt-cp.1
- doc/man/salt-key.1
- doc/man/salt-master.1
- doc/man/salt-minion.1
- doc/man/salt-proxy.1
- doc/man/salt-run.1
- doc/man/salt-ssh.1
- doc/man/salt-syndic.1
- doc/man/salt-unity.1
- doc/man/salt.1
- doc/man/salt.7
- doc/man/spm.1
- salt/states/pkgrepo.py
2018-05-15 12:29:29 -04:00
Ch3LL
31f13a4197
sysloghander: check for 3.5.4 python version
2018-05-10 14:12:15 -04:00
Ch3LL
a020352a03
Catch Sysloghandler errors when log file does not exist
2018-05-08 15:12:35 -04:00
rallytime
4ad50bbdee
Update old utils paths to new paths
2018-04-03 14:46:56 -04:00
rallytime
e8864b7b0b
Merge branch '2017.7' into '2018.3'
2018-03-28 13:52:28 -04:00
Ch3LL
4f1c42c0e3
Workaround getpwnam in auth test for MacOSX
2018-03-27 15:18:29 -04:00
rallytime
d83727fdf9
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/cli/api.py
- salt/client/ssh/wrapper/state.py
- salt/config/__init__.py
- salt/crypt.py
- salt/daemons/masterapi.py
- salt/key.py
- salt/loader.py
- salt/master.py
- salt/modules/archive.py
- salt/modules/hipchat.py
- salt/modules/pip.py
- salt/modules/state.py
- salt/modules/virt.py
- salt/modules/x509.py
- salt/state.py
- salt/transport/tcp.py
- salt/transport/zeromq.py
- salt/utils/__init__.py
- salt/utils/event.py
- salt/utils/extmods.py
- salt/utils/files.py
- salt/utils/parsers.py
- salt/utils/verify.py
- tests/integration/shell/test_call.py
- tests/unit/utils/test_args.py
2018-03-06 13:45:59 -05:00
Erik Johnson
31b1d98fcb
Replace direct use of os.umask with use of existing context manager
...
In cases where os.umask was being used simply to get the umask, a new
helper function has been added to keep improper direct usage of os.umask
from permanenly modifying the umask.
2018-02-27 23:42:51 -06:00
Daniel Wallace
9ce14b2a12
pass opts to SSHClient for enable_ssh_minions
...
Also, use ckminions to get the minions from the roster, instead of doing it in
publish.
2018-02-20 16:06:00 -07:00
rallytime
fb4f2dd0fa
Distinguish between Authorization and Authentication errors
...
And handle the error distiction being returned from the publish function
instead of sending empty strings.
2018-01-23 17:05:22 -05:00
Erik Johnson
49dd5b32e9
[PY3] Add unicode_literals to acl, auth, and netapi modules
2018-01-05 10:31:11 -06:00
Erik Johnson
002aa88a97
Replace yaml usage with a helper to ensure unicode is handled properly
...
Without allow_unicode=True, unicode characters are processed through the
str representer and on Python 2 are dumped as a Unicode code point (i.e.
a literal \u0414). This commit makes allow_unicode=True the default in
our salt.utils.yamlloader.safe_dump() helper. It also adds a new
salt.utils.yamlloader.dump() helper which wraps yaml.dump() and also
makes allow_unicode=True the default.
To make importing and using our custom yaml loader/dumper easier, a
convenience module called salt.utils.yaml has been added, which does a
wildcard import from both salt.utils.yamldumper and
salt.utils.yamlloader.
Refs to yaml.load/dump and yaml.safe_load/safe_dump have been updated to
salt.utils.yaml, to ensure that unicode is handled properly.
2018-01-03 14:14:21 -06:00
