rallytime
7dc1e770c4
Merge branch '2018.3' into 'develop'
...
Conflicts:
- doc/topics/installation/freebsd.rst
- salt/cloud/clouds/oneandone.py
- salt/grains/core.py
- salt/modules/napalm_ntp.py
- salt/modules/win_update.py
- salt/modules/win_wua.py
- salt/modules/zabbix.py
- salt/renderers/pass.py
- salt/states/vault.py
- tests/unit/states/test_win_update.py
2018-06-06 13:35:36 -04: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
rallytime
0eab957281
Merge branch '2018.3' into 'develop'
...
Conflicts:
- salt/netapi/rest_tornado/saltnado.py
- tests/integration/states/test_file.py
- tests/integration/states/test_git.py
- tests/unit/modules/test_tls.py
2018-04-20 15:40:49 -04:00
Erik Johnson
d7bfd1391f
Add unit test for tls.get_expiration_date
2018-04-19 12:03:51 -05:00
Erik Johnson
048728d2b7
Remove unused imports
2018-04-18 19:46:32 -05:00
Erik Johnson
879c557264
Use decorators for temp files/dirs in test suite
...
This adds a new decorator which creates a temporary directory and cleans
it after the test completes. It also modifies an existing decorator for
creating temporary files so that it accepts arguments, which will be
passed through to salt.utils.files.mkstemp().
2018-04-18 19:46:29 -05:00
Gareth J. Greenaway
b3c1be27fb
Tier two unicode updates for modules, states and related tests.
2018-01-25 11:59:25 -08:00
rallytime
ccf790a83f
Update all references for moved functions to use "files" util
...
- fopen
- flopen
- fpopen
- safe_rm
- is_empty
- is_fcntl_available
2017-07-18 10:31:01 -06:00
Pedro Algarvio
abe608d739
Drop @patch usage
2017-04-28 13:36:42 +01:00
rallytime
d5b1241972
Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict
...
he pip junos-eznc package, when installed with PyOpenSSL version 0.14 causes
this test failure. If you either remove junos-eznc, or upgrade PyOpenSSL
(current is 0.17) the test is happy. So, we need to handle this case in the test.
2017-04-20 17:02:33 -06:00
Pedro Algarvio
d397763553
Adjust to the new LoaderModuleMockMixin usage
2017-03-28 19:03:59 +01:00
Pedro Algarvio
f23596cbd1
Proper mocking. Py3 Compat.
2017-03-28 19:02:50 +01:00
Pedro Algarvio
9b1e55aa85
Import the full module namespace to avoid import shadowing.
...
https://github.com/saltstack/salt/pull/39996#issuecomment-287857698
2017-03-28 19:02:47 +01:00
Pedro Algarvio
0b41b92d7d
Use salt.utils.versions instead of distutils.version
2017-03-08 19:22:33 +00: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
