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
rallytime
94c2a12be6
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- tests/integration/modules/test_state.py
- tests/unit/templates/test_jinja.py
- tests/unit/test_minion.py
2018-04-17 10:54:42 -04:00
Matt Phillips
8af3f5b874
GH-47000: add proper handling of full_return in cmd_subset
...
as noted in the original issue, full_return wasnt being handled properly. This
rectifies that.
2018-04-13 10:58:03 -04:00
rallytime
4ad50bbdee
Update old utils paths to new paths
2018-04-03 14:46:56 -04:00
rallytime
893196d3e6
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/conf.py
- salt/loader.py
- salt/modules/dockermod.py
- salt/modules/sensehat.py
- salt/utils/parsers.py
- tests/integration/cloud/providers/test_ec2.py
- tests/integration/modules/test_cp.py
- tests/integration/modules/test_groupadd.py
- tests/integration/spm/test_man_spm.py
- tests/integration/states/test_npm.py
- tests/unit/states/test_environ.py
2018-04-03 14:33:11 -04:00
Daniel A. Wozniak
ec4634fc06
Better explanation in doc strings
2018-03-27 10:35:51 -07:00
Daniel A. Wozniak
d9ae2abb34
Fix splling in docstring
2018-03-26 09:45:04 -07:00
Daniel A Wozniak
b40efc5db8
Windows test client fixes
...
- Skip IPC transport test on windows
- Add TCP transport test for windows
2018-03-23 15:36:32 -07:00
Erik Johnson
8cdb9ea54f
[PY3] Add print_function import to files with unicode_literals already added
...
This makes the 2.x usage invalid syntax and forces the use of print as a
function. This adds the import to the files which I've updated in the
last couple of days but forgot to add it.
2017-12-15 12:14:18 -06:00
Erik Johnson
239fc8d774
[PY3] Add unicode literals to the clients and associated files/tests
2017-12-15 00:19:55 -06:00
Pedro Algarvio
abe608d739
Drop @patch usage
2017-04-28 13:36:42 +01:00
Pedro Algarvio
75569c8e99
unittest.TestCase does not have a skip() method. It's skipTest.
2017-04-28 13:33:33 +01:00
Pedro Algarvio
8031ac0209
Move mixins to tests.support.mixins.
...
The adapted config mixin get config methods are not static methods
2017-04-04 17:29:34 +01:00
Pedro Algarvio
f66eaa45bf
Use a temporary configuration
2017-04-01 14:30:27 +01:00
Pedro Algarvio
c42b6ff4b5
This just feels wrong
2017-04-01 14:22:56 +01:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup.
2017-03-01 01:33:07 +00:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt.
...
Let's drop the salttesting dependency cycle.
2017-02-28 22:52:49 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest.
2017-02-23 23:19:42 +00:00
