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
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
Thayne Harbaugh
ab09d08c99
Expand test integration.modules.grains to check for new minion process grains.
2015-11-03 00:14:32 -07:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Mike Place
919e9db946
Increase timeout for grains test
2014-07-17 13:27:08 -06:00
Pedro Algarvio
d02a2bc224
Include the python encoding file header on tests.
2013-11-27 11:19:24 +00:00
Thomas S Hatch
bb45a8b9f2
sleep longer for grains test if first return is bad
2013-08-13 00:35:55 -06:00
Thomas S Hatch
6d4af97e17
put a sleep back on grains.setval test for new jenkins stuff
2013-08-10 22:33:02 -06:00
Pedro Algarvio
b340166ea6
Updated integration.modules.grains test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
222be7b446
Make sure every test module is runnable by __main__.
...
* Double to single quotes
2013-06-28 00:12:56 +01:00
Pedro Algarvio
be54a503d9
Adapted code fix sys.path in case called from __main__. Adapted to salt-testing.
2013-06-28 00:12:56 +01:00
Thomas S Hatch
3e7be2bfb4
Add os import to grains tests
2013-06-19 22:45:26 -06:00
Thomas S Hatch
e037283488
Ignore the grains setval test in travis because travis can't keep up
2013-06-19 22:28:53 -06:00
Thomas S Hatch
e59a646afa
Need to find a way to only bump this up on travis....
2013-06-19 00:32:08 -06:00
Thomas S Hatch
324f048ae5
Raise sleep here because travis is SLOW
2013-05-31 02:00:56 +00:00
Thomas S Hatch
82dde7d7e7
Add a sleep to give the minion a chance to catch grain refresh in test
2013-05-29 00:12:30 -06:00
Thomas S Hatch
562fbdaed2
Add grains.get test
2013-05-26 06:11:59 -06:00
Thomas S Hatch
04ad87f9fb
Add test to grains.setval
2013-05-26 04:11:42 -06:00
Pedro Algarvio
34522907e8
One more grain.item fix to comply with new dict output.
2013-01-23 23:00:19 +00:00
Ulrich Dangel
7176ec5d4a
Add test to test if os_family grain is provided.
...
Corey Quinn reported a issue where __grains__['os_family'] returned a
KeyError. This commits adds a check to the grains module test to ensure
os_family is present.
2012-08-15 02:59:03 +02:00
Roman Imankulov
bb0ed1a3a7
Tests cleanup
...
Defined "integration.run_tests()" function which can be used to execute
a particular integration test case. Existing bolerplate code in modules
and states tests is replaced with following lines:
if __name__ == '__main__':
from integration import run_tests
run_tests(TestCaseName)
Typical usecase could look like this:
python integration/modules/pip.py --no-clean -vv
2012-07-20 12:25:08 +06:00
Intchanter
3c05a3ee78
Merge branch 'develop' of https://github.com/saltstack/salt into develop
...
Conflicts:
tests/integration/modules/grains.py
tests/integration/states/host.py
tests/unit/utils/find_test.py
2012-07-04 18:29:13 -06:00
Dan Colish
c5cdb366dc
Fix test.integration.states.host. Make master_config and minion_config a property to keep semantics consistent
2012-06-30 13:54:23 -07:00
Intchanter
a1433ef5ec
PEP8 fixes for tests
2012-06-30 14:10:34 -06:00
Jeff Schroeder
a561e224f2
DRY with the grains integration tests
2012-05-09 21:39:49 -07:00
Baiju Muthukadan
cb5e3ea089
Add testrunner boilerplate code to run tests
2012-05-05 19:39:23 +05:30
Eivind Uggedal
ab7ace6aa5
Split out integration tests from pure unit tests.
...
Integration tests requiring a salt master and daemon were seperated
from pure unit tests. For now both are run with runtest.py. In
the future it could take arguments for which type of tests to run.
2012-02-20 13:18:13 +01:00
