Ch3LL
b761059405
add absolute_import
2016-03-16 20:58:41 -06:00
Ch3LL
5bcc5b2f21
fix pylint and remove super()
2016-03-16 11:44:55 -06:00
Ch3LL
3c03d9bd57
add mac_defaults test
2016-03-10 16:34:18 -07:00
rallytime
fe7ff0ebfa
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cloud/__init__.py
- salt/returners/smtp_return.py
2016-03-10 13:13:35 -07:00
Ch3LL
910f0d9ffc
change pkg name to less for suse
2016-03-10 11:18:44 -07:00
Justin Findlay
e0abe23c7e
states.ssh int tests: run both test cases manually
2016-03-10 10:57:21 -07:00
Justin Findlay
d33b365984
states.pkg int tests: add pkgs for MacOS
2016-03-10 10:57:21 -07:00
Justin Findlay
431a247b66
states.cmd int tests: echo is more portable than true
2016-03-10 10:57:21 -07:00
Justin Findlay
7c48cf7ea6
states.user int tests: check MacOS primary group
2016-03-10 10:57:20 -07:00
Justin Findlay
5d5ce619b7
states.user int tests: disable GECOS for MacOS
2016-03-10 10:57:20 -07:00
Justin Findlay
aa61e1056f
states.file int tests: find root's primary group
2016-03-10 10:57:20 -07:00
Justin Findlay
2fe1160143
modules.mac_user.primary_group: add integration test
2016-03-10 10:57:19 -07:00
Justin Findlay
5905518ee5
modules.mac_user int tests: fix comment typo
2016-03-10 10:57:19 -07:00
Justin Findlay
fea37b303e
modules.mac_user int tests: move common decorators to class
2016-03-10 10:57:19 -07:00
Justin Findlay
e53ae6c44e
modules.useradd.primary_group: add integration test
2016-03-10 10:57:19 -07:00
Justin Findlay
ba19f395d1
modules.useradd int tests: disable testcase on nonlinux
2016-03-10 10:57:19 -07:00
Justin Findlay
ddea2361de
modules.useradd int tests: move decorators to class
2016-03-10 10:57:19 -07:00
Justin Findlay
f69ab83623
modules.disk int tests: mtab not used on darwin
2016-03-10 10:57:19 -07:00
Justin Findlay
d818810200
modules.disk int tests: move decorators to class
2016-03-10 10:57:19 -07:00
Justin Findlay
bdb210dc13
modules.disk int tests: assert darwin disk usage
2016-03-10 10:57:19 -07:00
Justin Findlay
73ad02e917
modules.disk: run both integration test cases manually
2016-03-10 10:57:19 -07:00
Justin Findlay
2f1c0cf809
shell tests: strip whitespace from shell return
2016-03-10 10:57:19 -07:00
Justin Findlay
c94dfb870f
shell tests: comment on shell return data
2016-03-10 10:57:19 -07:00
Justin Findlay
4028d80eee
tests...runtests_helpers: use system tmpdir
2016-03-10 10:57:18 -07:00
Justin Findlay
6b99798b1e
tests.integration: use system tmpdir on darwin
2016-03-10 10:57:18 -07:00
rallytime
838dc12b77
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cli/daemons.py
- salt/config/__init__.py
- salt/exceptions.py
- salt/pillar/foreman.py
- salt/returners/local_cache.py
- salt/states/saltmod.py
- salt/utils/__init__.py
- salt/utils/cloud.py
The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
2016-03-08 10:14:32 -07:00
rallytime
6559ea15b0
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- doc/glossary.rst
- salt/config.py
- tests/unit/modules/gpg_test.py
2016-03-06 10:59:46 -07:00
rallytime
beb9d0fe84
Ensure all integration test classes and funcs are documented w/examples
2016-03-04 12:13:27 -07:00
Erik Johnson
da954d7b92
Add integration test for packages with epoch in version
...
This starts with cent7, but later I can add cent6 as well.
2016-03-03 15:40:22 -06:00
rallytime
031a75ca33
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- Contributing.rst
- conf/master
- doc/index.rst
- doc/man/salt.7
- pkg/suse/README.suse
- salt/client/ssh/state.py
- salt/minion.py
- salt/modules/zypper.py
- salt/utils/schedule.py
- tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
86433f2378
Revert changes in files used by roots_test.py
integration test
2016-03-02 10:00:45 +02:00
Denys Havrysh
e7a8dbf498
Remove trailing white spaces in tests files
2016-03-01 17:40:02 +02:00
Mike Place
ada5ab344d
Merge pull request #31561 from jtand/beacons_test_fix
...
Skipped test
2016-02-29 21:11:22 -07:00
justinta89
196dd4db99
Skipped test
2016-02-29 14:21:19 -07:00
rallytime
b683df9b82
Pylint fix
2016-02-29 11:12:55 -07:00
rallytime
24505d2dcf
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- salt/client/ssh/state.py
- salt/fileclient.py
- salt/minion.py
2016-02-29 10:47:40 -07:00
Erik Johnson
0d352bbc16
Add fileclient tests
2016-02-29 01:05:33 -06:00
Ch3LL
29a53f4353
rename methods in pkg states test
2016-02-26 06:54:01 +09:00
Nicole Thomas
625da0d261
Merge pull request #31471 from cachedout/issue_31427
...
Correct issue where duplicate items in grains list during state run will result in duplicate grains
2016-02-25 13:15:20 -07:00
rallytime
3b74d123af
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/modules/selinux.py
- salt/modules/zypper.py
- salt/pillar/__init__.py
- salt/states/dockerng.py
- tests/runtests.py
2016-02-25 12:36:22 -07:00
Mike Place
fb1ef92e2b
Merge pull request #31411 from jtand/beacons_tests
...
Added some beacons execution module integration tests
2016-02-25 09:16:26 -07:00
Mike Place
30eb5fccf7
Additional tests, but disable the test for distinct lists, because of a problem with context in test suite
2016-02-24 13:53:49 -07:00
Mike Place
3d2aec05e5
Check for duplicate grains during list insertion
...
Insert grains into context so that we can know if we're duplicating during multiple inserts in a state run.
Refs #31427
2016-02-24 11:43:24 -07:00
Mike Place
987dd89979
Merge pull request #31445 from rallytime/fix-31366
...
Only use LONGSIZE in rpm.info if available. Otherwise, use SIZE.
2016-02-24 11:35:31 -07:00
Mike Place
979c8b4faa
Merge pull request #31464 from Ch3LL/fix_int_test
...
integartion test: ensure decorator only runs on one method and not class
2016-02-24 11:35:00 -07:00
justinta89
7d32b56015
Added some more checks to verify beacon changes were actually happening
2016-02-24 10:38:23 -07:00
justinta89
2da5285c03
Added codeauthor
2016-02-24 09:56:11 -07:00
Ch3LL
a387d175d8
integartion test- ensure decorator only runs on one method and not entire class
2016-02-25 01:55:35 +09:00
rallytime
9965fe188a
Added to pkg.info_installed test for RedHat and Suse systems
2016-02-24 09:50:52 -07:00
justinta89
fd1e2838ea
Lint
2016-02-23 19:40:42 -07:00