Daniel A. Wozniak
b0af11f3d3
Run include tests when pillar source changes
2019-04-10 22:41:47 +00:00
Gareth J. Greenaway
e37fc20e7c
Merge branch '2018.3' into merge-2018.3
...
Conflicts:
- doc/ref/modules/all/index.rst
- salt/states/file.py
- tests/unit/modules/test_yumpkg.py
- tests/unit/modules/test_zypperpkg.py
- tests/unit/states/test_file.py
2019-02-22 16:38:15 -08:00
Daniel Wallace
d59952fce6
Merge branch '2018.3' into virtualnames
2019-02-19 16:59:42 -06:00
Daniel Wallace
33bb5bfe69
fix use of virtualname
...
Make sure that the virtualname is included in the actual filename of
core modules. This will help speed up loading of modules that need to
use the virtualname, so that we hit @depends decorators less.
2019-02-19 13:16:06 -06:00
Ch3LL
ffa2f5fa50
Merge branch '2018.3' into '2019.2'
...
Conflicts:
- pkg/windows/build_env_2.ps1
- pkg/windows/build_env_3.ps1
- pkg/windows/req.txt
- pkg/windows/req_win.txt
- salt/grains/core.py
2019-02-15 15:09:36 -05:00
Gareth J. Greenaway
0760133336
adding integration.scheduler.test_helpers to various files to by pass the test_module_name_source_match check.
2019-02-13 09:27:55 -08:00
Pedro Algarvio
78c6d68008
Run tests from tox, wether runtests or pytest
2019-01-25 13:00:02 +00:00
Pedro Algarvio
6bb56ced2e
Run tests from tox, wether runtests or pytest
2019-01-24 17:02:13 +00:00
Gareth J. Greenaway
0f15796484
Merge branch '2018.3' into merge-2018.3
...
Conflicts:
salt/utils/schedule.py
2018-11-26 11:43:51 -08:00
Gareth J. Greenaway
4bd0406e8d
Adding integration.scheduler.test_maxrunning to ignore list.
2018-11-23 17:07:16 -08:00
rallytime
3f2712fbc1
Merge branch '2018.3' into 'fluorine'
...
Conflicts:
- tests/unit/states/test_virt.py
- tests/unit/test_config.py
2018-10-29 12:36:28 -04:00
Erik Johnson
65fef9a7c0
Moar Lint
2018-10-23 14:48:31 -05:00
Erik Johnson
2ac939eace
Add test to check test module names and make sure they match the naming convention
2018-10-23 14:47:17 -05:00
Erik Johnson
80dcb44a0d
Merge remote-tracking branch 'upstream/2018.3' into merge-fluorine
...
Conflicts:
- salt/utils/mac_utils.py
- tests/unit/config/test_config.py
- tests/unit/loader/test_globals.py
- tests/unit/ssh/test_ssh.py
- tests/unit/templates/test_jinja.py
- tests/unit/utils/vmware/test_host.py
- tests/unit/utils/vmware/test_license.py
2018-08-17 07:52:59 -05:00
Erik Johnson
ac50eb84e1
Remove redundant "test" from filename
2018-08-14 13:53:29 -05:00
