Colton Myers
0b7ac988cc
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
salt/beacons/service.py
salt/beacons/sh.py
salt/modules/cassandra_cql.py
salt/returners/cassandra_cql_return.py
2015-04-01 14:22:33 -06:00
Joshua Semar
a5b28ad24d
fix tests return value
2015-03-30 16:42:19 -05:00
Joshua Semar
95aa3518d5
fix cas behavior on data module
...
data.cas was not saving changes. We now call dump after
receiving the change
2015-03-30 16:01:28 -05:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Pedro Algarvio
d02a2bc224
Include the python encoding file header on tests.
2013-11-27 11:19:24 +00:00
Pedro Algarvio
423976e5d5
Updated integration.modules.data test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +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
e61ddfdcfc
fix many a test
2012-07-23 13:00:54 -06:00
Intchanter
768e17b9d5
We return tuples, not lists
2012-07-20 08:31:36 -06: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
df4a83ac61
Made data.getvals work with CLI, updated test
2012-07-19 21:35:23 -06:00
Baiju Muthukadan
cb5e3ea089
Add testrunner boilerplate code to run tests
2012-05-05 19:39:23 +05:30
Thomas S Hatch
118c02886a
Add tests for the data module
2012-03-27 23:45:49 -06:00
