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
Nicole Thomas
63efb76d51
Merge pull request #47822 from Ch3LL/win_user_test
...
Add user state integration tests to windows
2018-05-30 17:13:06 -04:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/modules/win_snmp.py
- tests/integration/modules/test_saltutil.py
- tests/integration/states/test_pkg.py
- tests/support/helpers.py
- tests/support/runtests.py
- tests/unit/fileserver/test_gitfs.py
- tests/whitelist.txt
2018-05-29 11:14:39 -04:00
Nicole Thomas
96b7c0cc76
Merge pull request #47778 from Ch3LL/win_state_pkg
...
Add test_pkg integration state tests to windows
2018-05-25 16:36:46 -04:00
Ch3LL
7848114d6a
Add win_dns module integration tests for windows
2018-05-24 14:11:27 -04:00
Ch3LL
788abf771e
Add user state integration tests to windows
2018-05-24 11:46:02 -04:00
Ch3LL
872e162137
Add test_pkg integration state tests to windows
2018-05-22 15:11:14 -04:00
rallytime
25f03ae425
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- tests/integration/modules/test_status.py
- tests/integration/states/test_pip_state.py
- tests/support/case.py
- tests/whitelist.txt
2018-05-09 11:24:02 -04:00
Daniel A. Wozniak
b3289e5a1c
Fix test file name
2018-05-07 14:40:15 -07:00
rallytime
786076ac03
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- pkg/windows/modules/get-settings.psm1
- salt/modules/cmdmod.py
- salt/modules/pip.py
- salt/modules/win_lgpo.py
- salt/states/pip_state.py
- tests/integration/states/test_pip.py
- tests/support/helpers.py
- tests/unit/modules/test_pip.py
- tests/whitelist.txt
2018-05-07 13:17:01 -04:00
Nicole Thomas
da9871d36b
Merge pull request #47196 from twangboy/fix_47024
...
Fix issues with pip
2018-05-04 10:23:03 -04:00
rallytime
a94cdf8a0d
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/daemons/flo/zero.py
- salt/minion.py
- salt/pillar/pillar_ldap.py
- salt/transport/zeromq.py
- salt/utils/async.py
- salt/utils/zeromq.py
- tests/integration/modules/test_service.py
- tests/integration/netapi/rest_tornado/test_app.py
- tests/unit/fileserver/test_gitfs.py
- tests/unit/modules/test_pip.py
2018-05-02 15:00:40 -04:00
Nicole Thomas
b14e974b5f
Merge pull request #47343 from Ch3LL/win_srv_test
...
Add additional service module integration tests and enable for windows
2018-05-02 09:39:45 -04:00
Shane Lee
f031710af2
Merge branch '2017.7' into fix_47024
2018-05-01 16:26:04 -06:00
twangboy
7c46d9d0d4
Fix integration.modules.test_pip
...
Pass password as kwarg for runas on Windows
Fix issues with pip 10 in unit.states.test_pip
2018-05-01 15:33:29 -06:00
rallytime
13e8124031
Merge branch '2017.7' into '2018.3'
...
Due to the many merge conflicts created from #47106 against the 2017.7 branch
and #46002 against the 2018.3 branch, the changes from #47106 have been largely
removed from this merge forward and the HEAD of 2018.3 was taken.
A separate fix for Tornado 5.0 support will need to be made directly against the
2018.3 branch.
Conflicts:
- doc/topics/development/conventions/formulas.rst
- salt/master.py
- salt/minion.py
- salt/netapi/rest_tornado/saltnado.py
- salt/states/zfs.py
- salt/transport/ipc.py
- salt/transport/tcp.py
- salt/transport/zeromq.py
- salt/utils/async.py
- tests/support/helpers.py
- tests/support/parser/cover.py
- tests/unit/grains/test_core.py
- tests/unit/modules/test_ssh.py
- tests/unit/test_minion.py
- tests/unit/utils/test_safe_walk.py
2018-04-27 13:38:35 -04:00
Nicole Thomas
55534fb659
Merge pull request #47311 from Ch3LL/firewall_windows
...
Add firewall execution modules tests for windows
2018-04-27 09:10:53 -04:00
Ch3LL
d58be06751
Add additionatl service module integration tests and enable for windows
2018-04-26 18:13:20 -04:00
Nicole Thomas
a545e55543
Merge pull request #47281 from Ch3LL/system_test
...
Add win_system integration module tests
2018-04-26 12:07:40 -04:00
Ch3LL
4e16c18c16
Add firewall module windows tests to whitelist
2018-04-25 15:26:45 -04:00
Ch3LL
ced7f86546
Add windows ntp integration module tests
2018-04-24 15:12:58 -04:00
Ch3LL
0d0c8987fc
Add win_system integration module tests
2018-04-24 14:37:14 -04:00
Nicole Thomas
d4269c2b70
Merge pull request #47193 from Ch3LL/network_test
...
Add network module integration tests
2018-04-20 09:37:18 -04:00
Nicole Thomas
c777248a78
Merge pull request #47189 from Ch3LL/autoruns
...
Add autoruns.list integration test for Windows
2018-04-19 17:16:33 -04:00
rallytime
4718d31e53
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/config/__init__.py
- salt/minion.py
- salt/modules/pip.py
- salt/states/pip_state.py
- salt/states/virtualenv_mod.py
- tests/integration/modules/test_status.py
2018-04-19 17:15:20 -04:00
Ch3LL
bbf9987c19
Add network module integration tests
2018-04-19 16:17:35 -04:00
Nicole Thomas
65f344e371
Merge pull request #47184 from Ch3LL/status_test
...
Add status module integration modules tests for Windows
2018-04-19 15:38:55 -04:00
Ch3LL
6a88bedb7a
Add autoruns to windows whitelist
2018-04-19 15:12:08 -04:00
twangboy
345daa0423
Add additional integration tests to whitelist
2018-04-19 10:52:14 -06:00
Ch3LL
25a84428b8
Add status module integration modules tests for Windows
2018-04-19 12:01:40 -04:00
twangboy
3cf4ac1475
Add integration tests for reg state
...
Fix issues with binary data found in testing
2018-04-16 14:51:56 -06:00
Ch3LL
7cda825e90
Add groupadd module integration tests for Windows
2018-03-23 13:30:22 -04:00
twangboy
e4876abcde
Add back the two loader tests
2017-04-17 14:04:20 -06:00
twangboy
9d7f78e896
Remove non-existent tests from whitelist
2017-04-14 14:35:06 -06:00
twangboy
17f846a13c
Add missing import to win_file, remove tests from whitelist
2017-03-29 22:23:05 +00:00
twangboy
05cca8b72d
Add filerserver test to whitelist, skip symlink test
2017-03-10 11:05:02 -06:00
twangboy
eb0b7227e9
Fix incorrect test name
2017-03-02 13:31:52 -07:00
Shane Lee
eb6d317289
Merge branch 'develop' into win_fix_renderers_tests
2017-03-02 10:29:36 -07:00
twangboy
25b6d221c4
Fix ext_grains and ext_modules tests for Windows
2017-03-01 14:00:06 -07:00
Mike Place
517842a339
Merge pull request #39696 from twangboy/win_fix_returners_tests
...
Fix job cache tests, add librato return tests
2017-03-01 10:24:59 -07:00
twangboy
dc42987137
Add integration.sdb.test_env tests
2017-02-27 15:09:25 -07:00
twangboy
b434523a51
Fix job cache tests, add librato return tests
2017-02-27 13:26:42 -07:00
twangboy
7f79683691
Add to the whitelist
2017-02-24 15:31:55 -07:00
twangboy
e50ae8dd37
Fix wheel tests
2017-02-24 09:31:47 -07:00
twangboy
2e9122e134
Fix fileserver.fileclient reference
2017-02-15 22:44:09 +00:00
twangboy
98d5cc3e1b
Add additional tests to the Windows whitelist
2017-02-15 21:21:55 +00:00
twangboy
4951deed3e
Add whitelist for windows tests
2016-08-23 11:22:24 -07:00
