Commit Graph

256 Commits

Author SHA1 Message Date
Pedro Algarvio
b555ddf658 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Pedro Algarvio
9d0fe5b1d1 Merge branch '2014.7' into 2015.2
Conflicts:
	salt/modules/brew.py
	tests/integration/__init__.py
2015-01-11 22:40:16 +00:00
Mike Place
7d4123c6b3 Async flag and test cleanup 2015-01-09 21:21:50 -07:00
Mike Place
9d7990f264 Async flag and test cleanup 2015-01-09 13:14:33 -07:00
Pedro Algarvio
733b31da23 Merge branch '2014.7' into develop
Conflicts:
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
2014-11-27 03:59:40 +00:00
Pedro Algarvio
62ec46d6dd Switch open() for salt.utils.fopen() 2014-11-26 23:37:01 +00:00
Pedro Algarvio
d957d2e911 Switch open() for salt.utils.fopen() 2014-11-26 23:36:26 +00:00
Pedro Algarvio
bea345e720 Switch open() for salt.utils.fopen() 2014-11-26 23:35:31 +00:00
Pedro Algarvio
1857a0d31f Switch open() for salt.utils.fopen() 2014-11-26 23:30:18 +00:00
Pedro Algarvio
8735242906 We need to call read()! 2014-11-26 23:13:19 +00:00
Pedro Algarvio
1eeb02d93f Add a missed with 2014-11-26 21:07:39 +00:00
Pedro Algarvio
47edf6fc89 Fix the with context 2014-11-26 20:49:04 +00:00
Pedro Algarvio
bfe99dbb3f Merge branch '2014.7' into develop
Conflicts:
	salt/cloud/__init__.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runners/lxc.py
	salt/runners/manage.py
2014-11-26 20:14:56 +00:00
Pedro Algarvio
2d210b9055 Switch open() for salt.utils.fopen() 2014-11-26 18:33:22 +00:00
Pedro Algarvio
d27c38d28f Switch open() for salt.utils.fopen() 2014-11-26 17:57:57 +00:00
Pedro Algarvio
70b657af20 Switch open() for salt.utils.fopen() 2014-11-26 17:56:43 +00:00
Pedro Algarvio
46ea34b4f5 Switch open() for salt.utils.fopen() 2014-11-26 17:55:30 +00:00
Pedro Algarvio
32b2f2e05f Switch open() for salt.utils.fopen() 2014-11-26 17:54:29 +00:00
Pedro Algarvio
2127a98667 Switch open() for salt.utils.fopen() 2014-11-26 17:52:46 +00:00
Pedro Algarvio
9230f5b5ee Switch open() for salt.utils.fopen() 2014-11-26 17:50:47 +00:00
Pedro Algarvio
753338e078 Switch open() for salt.utils.fopen() 2014-11-26 17:49:27 +00:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
2014-10-19 18:21:19 +01:00
Seth House
c6cb642f36 Added integration tests for the --out-indent flag for JSON output 2014-10-16 20:46:34 -05:00
Thomas S Hatch
1f5da204a9 Fix lint 2014-10-15 16:56:41 -06:00
C. R. Oldham
d07ebe2105 Test for retcode 2014-10-14 13:28:19 -06:00
rallytime
2c513cf2bb Remove print from tests 2014-10-09 10:33:34 -06:00
vs
af070a56ad its 'Denied Keys', not 'Denied Minions' 2014-09-24 14:10:49 +02:00
vs
b804056b65 add expected output for denied minions to test_* 2014-09-23 17:36:06 +02:00
rallytime
9c682933d4 Fix broken test on 2014.7 2014-09-22 12:13:10 -06:00
Pedro Algarvio
aed0178072 Correct --output-file-append test 2014-09-19 10:33:38 -06:00
Pedro Algarvio
8e3f9963cb Correct --output-file-append test 2014-09-17 19:40:58 +01:00
Thomas S Hatch
4df1ba300c Merge pull request #15839 from jacksontj/develop
Handle OSErrorin processmanager
2014-09-16 15:05:07 -06:00
Thomas Jackson
29110d0a92 Cleanup, the function name changed 2014-09-16 13:22:55 -07:00
rallytime
064868b87a Fix test failures on develop 2014-09-16 12:23:06 -06:00
Colton Myers
916141fac0 Merge branch '2014.7' into develop
Conflicts:
	tests/integration/shell/call.py
2014-08-20 14:39:31 -06:00
Pedro Algarvio
bf406bf459 Add test case for --output-file-append 2014-08-20 02:42:29 +01:00
Pedro Algarvio
b6e259c21e Add test case for output file permissions
Refs #14979
2014-08-20 02:28:13 +01:00
steverweber
bf8f936fa4 fix issues with keepalive minion 2014-07-25 15:13:05 -04:00
Aditya Kulkarni
88a873a171 Ensure tests pass on raet and zmq 2014-07-17 10:32:07 -04:00
Aditya Kulkarni
615e0b7550 Add timeouts to wait longer 2014-07-15 16:50:32 -04:00
Aditya Kulkarni
978ae5fb51 Make sure test_grain passes with raet 2014-07-15 16:27:47 -04:00
Aditya Kulkarni
91943766d3 Refactor salt key tests to be raet compatible 2014-07-14 15:22:38 -04:00
Pedro Algarvio
ed7d14e237 White-space lint fix 2014-07-05 00:45:53 +01:00
Pedro Algarvio
1ffb0e8a51 White-space related fixes 2014-07-04 00:56:49 +01:00
Pedro Algarvio
4acda7ab14 Move imports 2014-07-04 00:56:48 +01:00
Thomas S Hatch
07f55489b8 Merge pull request #13942 from cachedout/call_test_fix
Fix broken test.
2014-07-02 17:10:16 -06:00
Mike Place
51e3089a7c Fix broken test. 2014-07-02 14:40:08 -06:00
Nitin Madhok
900021a820 Fixing lint in tests/integration/shell/auth.py 2014-07-02 16:11:49 -04:00
Thomas S Hatch
a985508513 Merge pull request #13902 from cachedout/auth_test_fixing
Fix failing auth test
2014-07-02 10:17:16 -06:00
Mike Place
a8c422da07 Just run useradd/userdel once 2014-07-01 17:04:16 -06:00
Mike Place
6e31fb42a0 Decorate teardown just to be sure 2014-07-01 16:40:32 -06:00
Mike Place
be07ccbd7c Fix failing auth test 2014-07-01 16:38:30 -06:00
Mike Place
504378668c Fix broken arg test 2014-07-01 16:07:59 -06:00
Thomas S Hatch
1b4736d5df lint 2014-06-30 18:01:38 -06:00
Thomas S Hatch
50ee9dd5af Merge pull request #13680 from pass-by-value/file_perms_no_exit
File perms no exit
2014-06-30 17:43:54 -06:00
Thomas S Hatch
13099a458e Fix test where the arg passing should run through
parse input first
2014-06-26 21:48:59 -06:00
Aditya Kulkarni
b991977e69 Update expected message 2014-06-26 12:58:49 -04:00
Aditya Kulkarni
54110a9658 Fix paths 2014-06-26 10:18:58 -04:00
Nitin Madhok
6773a34c1f Fixing pylint violations 2014-06-25 19:27:16 -04:00
Aditya Kulkarni
55c92b4eeb Move master top file before test 2014-06-25 16:50:17 -04:00
Aditya Kulkarni
3a59cbf9cb Add regression test for master_tops 2014-06-25 14:53:11 -04:00
Aditya Kulkarni
79c55a4784 Make sure tests pass on the right setup 2014-06-24 14:13:30 -04:00
Aditya Kulkarni
2836600b87 Add tests for pam auth 2014-06-24 14:13:30 -04:00
Aditya Kulkarni
909213ab1f Add CLI options for username and password 2014-06-24 14:13:30 -04:00
Pedro Algarvio
d69bb5dfd9 No hard coded configuration paths 2014-06-05 10:10:56 +01:00
Pedro Algarvio
36ea569d0d Don't use hard coded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00
Pedro Algarvio
13106807b1 Better examples on tests 2014-04-24 16:04:51 +01:00
Pedro Algarvio
b969cd15f7 Handle too many arguments for docs in salt-run. Refs #12261. 2014-04-24 16:01:25 +01:00
Pedro Algarvio
f3fa2aef74 Handle too many arguments for docs in salt-call. Refs #12261. 2014-04-24 15:56:58 +01:00
Pedro Algarvio
762d0b1e24 Check for extra arguments to '--doc' and fail. Fixes #12261. 2014-04-24 15:42:47 +01:00
Thomas Jackson
df4dd4ec18 Fix failing shell test case-- and change up jobs runner to use the "output" config instead of hard coding what the option should be. In addition i changed the display_output function to default the "out" to None, since that means "use config" down inside. 2014-04-19 13:33:25 -07:00
Mathieu Le Marec - Pasquet
537f96fe14 salt-call now returns jobs to master
This is related to #10500.

This finishes @thatch45 work
2014-02-20 20:31:40 +01:00
Pedro Algarvio
db41d3b5c5 Ignore unused imports 2014-02-08 07:57:43 +00:00
Pedro Algarvio
e5b293e767 Remove unused imports 2014-02-08 07:57:10 +00:00
Pedro Algarvio
375de4e706 Remove unused imports 2014-02-08 07:56:40 +00:00
Pedro Algarvio
7c51c8ff7f Remove unused imports 2014-02-08 07:55:55 +00:00
Pedro Algarvio
74ef6ab26a Fix the syndic test 2014-01-20 15:50:51 +00:00
Pedro Algarvio
1c399660a9 Provide a path which should fail. 2014-01-20 13:12:57 +00:00
Pedro Algarvio
8a84079848 Test expected outout and raise expected errors if syslog is not available. 2014-01-20 11:24:54 +00:00
Pedro Algarvio
b8d45673d5 Adapt to expected output 2014-01-20 11:09:56 +00:00
Pedro Algarvio
a8a8f38ea4 Fix unit test expected results since we now exit with an error code. 2014-01-19 16:16:49 +00:00
Pedro Algarvio
a9429d8b18 Fix unit test expected results since we now exit with an error code. 2014-01-19 16:16:49 +00:00
Pedro Algarvio
26a8572b7e Fix unit test expected results since we now exit with an error code. 2014-01-19 16:16:49 +00:00
Pedro Algarvio
c6de2adb31 Fix unit test expected results since we now exit with an error code. 2014-01-19 16:16:49 +00:00
Pedro Algarvio
05b2636cd5 Fix unit test expected results since we now exit with an error code. 2014-01-19 16:16:49 +00:00
Pedro Algarvio
a5f2286960 Fix unit test expected results since we now exit with an error code. 2014-01-19 16:16:49 +00:00
Pedro Algarvio
7e62178d5a Add test case to conform parser errors on wrong arguments 2013-12-31 09:32:04 +00:00
Pedro Algarvio
68d7cc074b exsel matching is no longer supported. 2013-12-17 01:01:49 +00:00
Erik Johnson
cadbcbd59d add test case for #8585 2013-12-04 17:29:48 -06:00
Pedro Algarvio
62039527ce The cloud tests need libcloud installed. Skip them if not. 2013-11-28 19:40:17 +00:00
Pedro Algarvio
660a91d1ea Merge the salt-cloud cli integration tests into salt's test suite. Refs #8886. 2013-11-28 17:55:58 +00:00
Pedro Algarvio
0ae1a15c61 PEP8 E302 and E303 blank lines fixes. 2013-11-27 12:11:45 +00:00
Pedro Algarvio
08c5c8e83a Fix PyLint W1401, anomalous backslash. 2013-11-27 11:24:26 +00:00
Pedro Algarvio
d02a2bc224 Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
Erik Johnson
5ef4b31e97 Include more information in test docstrings
This adds additional information that describes the relevant code being
tested, so that if there is a problem it is easier to trace it back to
where the problem lies.
2013-11-06 14:03:33 -06:00
Erik Johnson
3c799c0bd5 Add test for arguments with dashes in the arg name 2013-11-06 14:00:02 -06:00
Erik Johnson
f24fb7c26f Add test for unsupported kwarg 2013-11-06 13:38:30 -06:00
Pedro Algarvio
c849c4b57f Moved test cases from #8195 to a better place. 2013-10-31 18:54:25 +00:00