Bo Maryniuk
b7da571624
Fix imports
2018-08-10 15:52:01 +02: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
Daniel Wallace
47b6d409d1
add io_loop handling to runtests engine
2018-04-28 11:16:26 -05:00
Daniel Wallace
93d1445ec1
add io_loop handling to runtests engine
2018-04-27 18:51:51 -05:00
Erik Johnson
0d975c335d
Add unicode_literals to engines
2018-01-07 14:01:48 -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
Pedro Algarvio
42065350f1
Catch and handle tornado.iostream.StreamClosedError exceptions
2017-03-09 19:29:16 +00:00
Pedro Algarvio
08804932c3
Using pytest start_daemon
2017-02-28 22:52:48 +00:00
twangboy
e96bfe8fa2
Change OSX/OS X to macOS where possible
2016-12-28 14:49:46 -07:00
Pedro Algarvio
f842ddd525
OSX testsuite fixes ( #35948 )
...
* OSX is a bit more restrictive on getting the process information
* OSX says the sockets aren't connected, which is weird, but...
* Close the sockets on OSX
2016-08-31 13:09:51 -06:00
Pedro Algarvio
184c3c83ad
Run the test daemons from CLI
...
This should help running the test suite on Windows machines
2016-05-23 13:56:00 +01:00
