Commit Graph

2589 Commits

Author SHA1 Message Date
Pedro Algarvio
0a10c4d2c7 Turns out all we needed was the correct load 2014-06-15 13:24:39 +01:00
Pedro Algarvio
79d7918271 Add missing path key to the load.
Minor PEP-8, global variable `load` -> `LOAD`
2014-06-15 13:18:36 +01:00
Pedro Algarvio
edffec0159 Fix imports 2014-06-15 13:05:19 +01:00
Pedro Algarvio
7b017fe9ab Skip test for now.
/CC: @cachedout
2014-06-15 13:05:19 +01:00
Pedro Algarvio
130788864f Skip tests on missing empty_dir 2014-06-15 13:05:19 +01:00
Pedro Algarvio
b2f3cecea5 Copy the extension modules into the new master root_dir 2014-06-15 13:05:19 +01:00
Pedro Algarvio
bd35008d34 No need for late imports. Use AdaptedConfigurationTestCaseMixIn. 2014-06-15 13:05:19 +01:00
Pedro Algarvio
9f7ead2e33 Remove unused imports 2014-06-15 13:05:18 +01:00
Pedro Algarvio
b815bb8cb6 Call the right parent class 2014-06-15 13:05:18 +01:00
Pedro Algarvio
ccdd70750c Leave any cleanup for the end 2014-06-15 13:05:18 +01:00
Pedro Algarvio
c2ab05bc56 Tempdir under integration.SYS_TMP_DIR and use AdaptedConfigurationTestCaseMixIn 2014-06-15 13:05:18 +01:00
Pedro Algarvio
000655d7f4 Use SaltClientTestCaseMixIn instead 2014-06-15 13:05:18 +01:00
Pedro Algarvio
4cbd6c6238 Remove unused imports 2014-06-15 13:05:17 +01:00
Pedro Algarvio
70f6a90ed6 Store evaluated configs as cls attributes 2014-06-15 13:05:17 +01:00
Pedro Algarvio
007f86b5d6 Remove stray print and commented out entries 2014-06-15 13:05:17 +01:00
Pedro Algarvio
d9ce87c04c Call verify_env on transplant_configs 2014-06-15 13:05:17 +01:00
Pedro Algarvio
318409a859 Don't remove the root_dir, the tests suite takes care of that 2014-06-15 13:05:17 +01:00
Pedro Algarvio
7fbc839942 Lay down computed configuration and use that source for all of the tests 2014-06-15 13:05:17 +01:00
Pedro Algarvio
97f150db74 Revert "detect the right transport for the client in tests"
This reverts commit d33b01d635.
2014-06-15 13:05:17 +01:00
Pedro Algarvio
9fbc894f51 Revert "Cache the salt client"
This reverts commit b4786b0d8c.
2014-06-14 19:19:44 +01:00
Thomas S Hatch
60ac9b8321 Merge pull request #13433 from ahammond/psql_nopassword
psql should never prompt for a password
2014-06-14 07:24:14 -06:00
Thomas S Hatch
396078d1aa Merge pull request #13446 from anylain/add_traverse_dict_and_list
Add salt.utils.traverse_dict_and_list()
2014-06-14 07:23:15 -06:00
panying
742607a33f + add test_traverse_dict_and_list 2014-06-14 15:25:02 +08:00
Andrew Hammond
1c6b95b4dc psql should never prompt for a password
No matter if we have been given a password or not, it never makes sense
for psql to interactively prompt for a password. It's better to fail
immediately than to hang because psql is waiting for input that will
never happen.
2014-06-13 17:40:11 -07:00
Pedro Algarvio
b4786b0d8c Cache the salt client 2014-06-13 23:47:03 +01:00
Mathieu Le Marec - Pasquet
a6262beeb3 Fix the broken check state logic 2014-06-13 13:20:14 +02:00
Pedro Algarvio
da7e7d71dd Merge pull request #13434 from rallytime/cloud_tests
Initial cloud provider tests for GoGrid
2014-06-13 01:08:30 +01:00
rallytime
276affe259 Initial cloud provider tests for GoGrid 2014-06-12 17:09:57 -06:00
Thomas S Hatch
d33b01d635 detect the right transport for the client in tests 2014-06-12 16:53:50 -06:00
Thomas S Hatch
3799fa0841 Merge pull request #13424 from terminalmage/fix-jinja-unit-tests
Fix jinja unit tests
2014-06-12 16:18:48 -06:00
Thomas S Hatch
46cdb04ada Merge pull request #13422 from cachedout/publish_tests
Fix publish tests
2014-06-12 14:14:23 -06:00
Mike Place
616c3b5547 Fix failing test 2014-06-12 13:35:36 -06:00
Erik Johnson
0104ccc400 Fix failing jinja unit tests
These began failing due to a recent change in the error reporting for
undefined jinja variables.
2014-06-12 14:33:53 -05:00
Thomas S Hatch
525cd2a064 Use new client function 2014-06-12 12:41:00 -06:00
Thomas S Hatch
af1a21691a Skip cleaning up syndic stuff so we don't have issues with raet tests
before the syndic stuff is all ready for testing
2014-06-12 12:35:24 -06:00
Pedro Algarvio
7451e50f63 Limit the options for transport. 2014-06-11 23:09:34 +01:00
Thomas S Hatch
0b02be9af1 Initial code to do raet integration salt tests 2014-06-11 15:35:27 -06:00
Pedro Algarvio
f316a8242f Merge pull request #13392 from rallytime/rackspace_cloud_tests
Rackspace with openstack driver cloud tests
2014-06-11 19:31:05 +01:00
rallytime
87bf98a0db Code clean-up and remove shadowing 2014-06-11 11:42:00 -06:00
rallytime
28b8900b9b Added expensiveTest decorator 2014-06-11 11:35:34 -06:00
rallytime
dd03b59dc6 Rackspace with openstack driver cloud tests 2014-06-11 11:26:30 -06:00
Pedro Algarvio
5f2cc54160 Assert proper return types from state calls.
Just to be sure.
2014-06-11 01:12:13 +01:00
Pedro Algarvio
8b03cd8d2e Decorate tests as expensive
Less trouble for the new runtests script
2014-06-10 19:25:04 +01:00
Pedro Algarvio
8ae3268037 Merge pull request #13339 from rallytime/cloud_tests
Cloud tests
2014-06-10 19:16:42 +01:00
rallytime
51896c4622 remove expensive test decorator and add run_test 2014-06-10 10:20:46 -06:00
Pedro Algarvio
0564fc363e A more generic directory name 2014-06-10 03:25:14 +01:00
Pedro Algarvio
5a14e33ab3 Add parser option to run cloud provider tests to runtests.py 2014-06-10 03:17:41 +01:00
Pedro Algarvio
5283fa661e Adapt tests to behaviour introduced in #13333 2014-06-10 03:00:19 +01:00
Pedro Algarvio
0b6776ad81 Maintain old test behaviour(no new lines added) 2014-06-10 02:32:22 +01:00
Pedro Algarvio
df3e06ddd7 Test needs root perms 2014-06-10 01:56:24 +01:00
Pedro Algarvio
9bd6d330ec Change to an existing directory before importing keyring 2014-06-10 01:52:53 +01:00
Pedro Algarvio
9d208eaf76 Use an explicit path for the keydir not getcwd 2014-06-10 01:52:53 +01:00
rallytime
36b2a3a0e7 Added cloud provider tests decorator 2014-06-09 14:49:49 -06:00
rallytime
da839f9ec7 salt-cloud tests for digital ocean 2014-06-09 14:49:49 -06:00
rallytime
ea879c0aa5 Error messaging 2014-06-09 14:49:49 -06:00
rallytime
7689a9bc99 salt-cloud tests for linode 2014-06-09 14:49:49 -06:00
Pedro Algarvio
e4591c4e27 Remove unnecessary comma 2014-06-07 13:53:02 +01:00
Pedro Algarvio
31a997e994 Provide a way to specify which minion version is bootstrapped
NOTE: This does not change which version is tested
2014-06-07 13:06:09 +01:00
Thomas S Hatch
5bd00c9dab Merge pull request #13287 from s0undt3ch/hotfix/lint
Lint Fixes
2014-06-06 09:13:38 -06:00
Pedro Algarvio
e02a931894 Print stderr 2014-06-06 12:25:01 +01:00
Pedro Algarvio
a7b7f18e6f Double to single quotes 2014-06-06 12:24:10 +01:00
Pedro Algarvio
01a48b6b5b Fix PEP8 E714 - test for object identity should be "is not" 2014-06-06 11:37:16 +01:00
Pedro Algarvio
e03226c67b Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:27:26 +01:00
Pedro Algarvio
d1a8e772da Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:27:01 +01:00
Pedro Algarvio
c6aa49c325 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:26:40 +01:00
Pedro Algarvio
05e5b19584 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:25:46 +01:00
Pedro Algarvio
3393be722c Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:25:32 +01:00
Pedro Algarvio
cf4a531e62 Fix ensure in syspath 2014-06-05 15:56:20 +01:00
Pedro Algarvio
81b93dc944 Skip tests which need the empty_dir.
These will run perfectly fine with the upcoming salt-runtests.
2014-06-05 11:54:07 +01:00
Pedro Algarvio
c3fbe4fe98 The cachedir configuration option needs to be set. 2014-06-05 11:10:24 +01:00
Pedro Algarvio
c8466453a0 Wrap text 2014-06-05 10:10:56 +01:00
Pedro Algarvio
ccbf2ebfb6 No hardcoded paths. Provide required additional configuration options. 2014-06-05 10:10:56 +01:00
Pedro Algarvio
da42560286 When using integration.run_tests the SSH option is not available 2014-06-05 10:10:56 +01:00
Pedro Algarvio
649c7e6d01 Ensure proper path in syspath 2014-06-05 10:10:56 +01:00
Pedro Algarvio
57dd2da63e Run the fileserver tests 2014-06-05 10:10:56 +01:00
Pedro Algarvio
d69bb5dfd9 No hard coded configuration paths 2014-06-05 10:10:56 +01:00
Pedro Algarvio
c4e47df943 Don't use the hardcoded path 2014-06-05 10:10:55 +01:00
Pedro Algarvio
bebddb9174 Don't use hardcoded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
36ea569d0d Don't use hard coded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
af503bfdcf Skip test if unable to import the git python package 2014-06-01 07:05:52 +01:00
Pedro Algarvio
7e11871d9f Ensure correct syspath 2014-06-01 06:55:52 +01:00
Thomas S Hatch
ba4cc71a14 fix more sls to yamlex refs 2014-05-30 10:14:47 -06:00
Thomas S Hatch
8b3dabbf7d lint 2014-05-30 09:45:46 -06:00
Thomas S Hatch
b8897a5b0d rename the sls renderer to the yamlex renderer 2014-05-30 09:28:20 -06:00
Thomas S Hatch
185eae31cd Merge branch 'serializers-migration' of https://github.com/johnnoone/salt into johnnoone-serializers-migration
Conflicts:
	salt/pillar/__init__.py
2014-05-30 09:16:21 -06:00
Thomas S Hatch
84f4fa1430 Merge pull request #13122 from cachedout/test_fixing
Fix broken tests
2014-05-30 09:08:53 -06:00
Pedro Algarvio
204ed95c2c PyLint ignore W1111 (assignment-from-none) 2014-05-30 09:38:35 +01:00
Mike Place
11e6ddf33c Fix SMTP test
Magic or ugly hack? You decide.
2014-05-29 16:38:59 -06:00
Mike Place
623b01af81 Pylint 2014-05-29 16:13:42 -06:00
Mike Place
0e53190996 Fix broken tests
Thanks to @rallytime for pointing out that several unit tests
were not working correctly when run locally.

I have fixed the perm_test to no longer use relative paths. I have
also disabled this tests since, at some point at least, perms changed
to be 0664 instead of 0644 in a number of places. This warrents further
discussion.

I have fixed pydsl_test to no longer throw errors to stdout about
missing SLS files. (Yay!!)

I have fixed the smtp_return tests so that it will without errors
on hosts with gnupg installed.
2014-05-29 15:04:11 -06:00
Pedro Algarvio
7bd8b1360f Remove remaining exsel code 2014-05-29 01:32:54 +01:00
Michaël Lemaire
7b437abd4f Fixed MagicMock import in postgres_test 2014-05-28 15:14:22 +02:00
Michaël Lemaire
cd0f4adae8 Fixed postgres_group.present always updating on test=True 2014-05-28 15:11:24 +02:00
Michaël Lemaire
07bedfe362 Fixed state postgres_user always updating on test=True 2014-05-28 15:05:50 +02:00
Michaël Lemaire
a4b3ef9a69 Added unit tests for postgres_user.present 2014-05-28 14:58:53 +02:00
Michaël Lemaire
5126f0a8ac states.postgres_extension: Fixed unit test patching (and renamed to PostgresExtensionTestCase for future tests) 2014-05-28 14:58:09 +02:00
Thomas S Hatch
b20462ad3f Merge pull request #13037 from terminalmage/npm-test
add test for npm.installed/removed
2014-05-27 10:11:27 -06:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00
Erik Johnson
da0546c6f4 add test for npm.installed/removed 2014-05-26 06:19:49 -05:00
Pedro Algarvio
283495a14f Merge pull request #12714 from cachedout/ssh_test_runner
Working salt-ssh test runner
2014-05-24 02:34:21 +01:00
Mike Place
c981914800 More Pylint 2014-05-23 15:27:19 -06:00
Mike Place
f3733fabf4 Clean up sshd config.
Remove hostkeys that are now dymaically generated per-run.

No more usepam
2014-05-23 15:04:11 -06:00
Mike Place
535ea24eea Now we don't need root anymore 2014-05-23 15:00:26 -06:00
Mike Place
d4be5906e0 Pylint 2014-05-23 14:52:28 -06:00
Mike Place
c753b77e10 Pass -i to salt-ssh 2014-05-23 14:38:52 -06:00
David Czarnecki
b8df9af0ff Fix rvm module test for adding cwd argument 2014-05-23 16:38:04 -04:00
Mike Place
7abc25f67f Generate server keys too 2014-05-23 14:11:14 -06:00
Mike Place
cf25592c53 Working salt-ssh test runner
This rounds out initial (alpha) support for a salt-ssh test runner.

At present, one must manually specify the --ssh flag to ensure that
the ssh deamons are spun up properly.

Conflicts:
	tests/integration/__init__.py
	tests/integration/files/conf/_ssh/sshd_config
	tests/integration/files/conf/sshd_config
	tests/integration/files/ext-conf/sshd_config
2014-05-23 14:11:14 -06:00
Thomas S Hatch
77a8232a1f Merge pull request #12994 from terminalmage/issue12172
Truncate id hash to 10 chars
2014-05-23 11:30:12 -06:00
Jason Swindle
e773e1fb57 #12989 Fix for '3 arguments (4 given)' error. 2014-05-23 09:45:00 -05:00
Erik Johnson
5e0d10f03c Update event tests to use truncated hash 2014-05-23 08:57:01 -05:00
Erik Johnson
0d35a56772 Ensure this test is run as root 2014-05-22 12:02:44 -05:00
Erik Johnson
4de5050ded Add test for sock path length 2014-05-22 11:59:26 -05:00
Joseph Hall
a0fae7c349 Cleanup whitespace issues for pylint 2014-05-21 19:31:46 -06:00
David Boucha
9dc182a2f4 fix codeauthor misspellings 2014-05-21 18:59:02 -06:00
Erik Johnson
512adb3136 Add test for shadow.gen_password
This addresses some breakage in this function. For more info, see
https://github.com/saltstack/salt/pull/12941.
2014-05-21 18:37:07 -05:00
Mike Place
888662692f Pylint zcbuildout
I see no evidence of this argument in use. Removed and modified test.

Closes #9556
2014-05-21 10:11:25 -06:00
Pedro Algarvio
5a8575dbb9 The helper method is now released 2014-05-20 10:53:47 +01:00
Thomas S Hatch
837ba1745d Merge pull request #12821 from rallytime/list_aliases
Make salt.states.target behave correctly with list of targets
2014-05-16 08:50:58 -06:00
rallytime
46f90298fb Pylint fixes 2014-05-15 20:05:08 -06:00
rallytime
c9623c7cc2 Unit tests for aliases module 2014-05-15 16:51:44 -06:00
rallytime
444cf57a9f Make salt.states.target behave correctly with list of targets 2014-05-15 12:47:26 -06:00
Mike Place
a3c848ede8 Heavy linting of docker module and re-do docker tests. 2014-05-15 09:53:30 -06:00
Thomas S Hatch
988101cf8d update tests to handle new return data from states 2014-05-14 16:09:27 -06:00
Gareth J. Greenaway
823575c901 Unit tests for file state broke after adding the follow_symlnks argument. Tests were looking for a value in a specific position in a dictionary which has been pushed back one value. Also fixing an issue that happened if the file being managed by the module is a symlink, file would be treated as a new file. 2014-05-14 11:30:28 -07:00
Elias Probst
f57dce2224 Correct usage of 'CLI Example' in documentation blocks
This mass-edit was done using the following shell command:
ack --python -l '^(\s*)CLI Example::$' \
| xargs sed -i \
's/^\(\s*\)CLI Example::/\1CLI Example:\n\n\1.. code-block:: bash/g'
2014-05-14 19:29:49 +02:00
Thomas S Hatch
2ad2739d98 Merge pull request #12680 from tedski/mdadm_refactor
Refactor mdadm module/state to support all options on create.
2014-05-12 16:38:56 -06:00
rallytime
0042169b7c Created renderers directory in salt/tests/unit for gpg_test.py 2014-05-12 13:21:26 -06:00
Pedro Algarvio
a1aee355e5 Include outputter tests in tests suite. 2014-05-12 19:10:11 +01:00
Pedro Algarvio
5d779444be No need to be root to run these tests 2014-05-12 19:09:55 +01:00
Pedro Algarvio
6b1380a25c Move sshd_config file to another directory to avoid problems. 2014-05-12 19:06:09 +01:00
rallytime
8bf15e9062 Integration tests for checking outputter return data 2014-05-12 11:31:59 -06:00
Ted Strzalkowski
71983ab581 another pylint fix 2014-05-11 19:06:09 -07:00
Ted Strzalkowski
2f417e1250 pylint fix 2014-05-11 18:57:43 -07:00
Ted Strzalkowski
35a1955ea8 Added unit tests for refactored mdadm module.
- test that mdadm.create returns the proper cmd.run inputs
- test that test_mode=True does not call cmd.run
2014-05-11 18:46:22 -07:00
Pedro Algarvio
df802117b1 Remove extra new line 2014-05-10 15:09:13 +01:00
Pedro Algarvio
592c669f75 Add coding header 2014-05-10 14:42:41 +01:00
Pedro Algarvio
8f1f212a7f Remove trailing white-space. 2014-05-10 14:41:48 +01:00
Mike Place
d7bba818a9 Only listen on localhost. 2014-05-10 14:18:53 +01:00
Mike Place
1fe291346f Cleanup 2014-05-10 14:18:53 +01:00
Mike Place
0cbac67a3f Support for continuous integration testing of salt-ssh 2014-05-10 14:18:53 +01:00
Pedro Algarvio
9630d43d05 Add option to run SSH tests.
Refs saltstack/salt-testing#16 and #12661
2014-05-10 14:12:04 +01:00
Thomas S Hatch
039e0841c1 Merge pull request #12548 from cachedout/12111
Eauth improvements and fixes
2014-05-09 13:55:42 -06:00
rallytime
aa45f50f04 Remove unused imports 2014-05-08 21:15:31 -06:00
rallytime
824969eab9 Correctly skip unit tests if gnupg is not installed 2014-05-08 21:10:15 -06:00
rallytime
cf4d2372b8 Modified GPG tests 2014-05-08 16:44:56 -06:00
Nicole Thomas
a77b55f054 Merge pull request #12527 from baconz/develop
Add unit tests and function doc strings to gpg renderer
2014-05-08 16:41:45 -06:00
Mike Place
33626659c7 Rewrite opts and pylint 2014-05-08 16:19:07 -06:00
Mike Place
f338bfd20e Pylint 2014-05-07 16:58:34 -06:00
Mike Place
f570ab8fd5 More client acl testing. 2014-05-07 16:43:52 -06:00
Erik Johnson
5c07011d65 Remove unnecessary test module 2014-05-07 13:00:33 -05:00
Thayne Harbaugh
871ba0010f BUG: The MOCK_HOSTNAME is not sufficiently long.
Extend the MOCK_HOSTNAME for a better chance that it will be longer
than the actual hostname.
2014-05-06 16:00:40 -06:00
Thayne Harbaugh
09eb54798b The MOCK_HOSTNAME is not sufficiently long to guarantee that it is
longer than the hostname on the current host.  Make it crazy long.
2014-05-06 15:28:55 -06:00
Mike Place
fac2c9754b Hook the assertions into the event system. 2014-05-06 12:04:12 -06:00
Mike Place
469989092d Pylint and (hopefully) Jenkins test fix. 2014-05-06 10:21:53 -06:00
Mike Place
e6e0eec532 More pylint 2014-05-06 09:23:09 -06:00
Mike Place
bbebbc6dfd Introducing eauth unit testing.
Typo
2014-05-05 16:52:26 -06:00
s8weber
d4b7951da8 fix minion id generation 2014-05-04 19:23:03 -04:00
Seth Madison
7453d6ef35 Add some unit tests for gpg renderer 2014-05-04 15:57:32 -04:00
Pedro Algarvio
e096df9016 Replace string substitution with string formatting 2014-05-01 13:29:38 +01:00
Pedro Algarvio
91182e9e44 Replace string substitution with string formatting 2014-05-01 13:29:38 +01:00
Chris Rebert
45981a56f9 lots of copyediting 2014-04-30 12:06:27 -07:00
Pedro Algarvio
9a20d4f43a Fix logic 2014-04-30 16:07:23 +01:00
Pedro Algarvio
7278635f28 Don't pip stderr to stdout 2014-04-30 08:39:49 +01:00
Pedro Algarvio
18df3d63b0 Don't fail when no JSON can be loaded 2014-04-30 00:46:21 +01:00
Pedro Algarvio
38493bae47 Strip empty strings. 2014-04-30 00:41:18 +01:00
Pedro Algarvio
a13632cd46 Don't fail hard of version comparison 2014-04-29 23:58:37 +01:00
Pedro Algarvio
e31ca389ae Provide a custom keyring just for tests.
Properly skip tests.
2014-04-27 13:26:59 +01:00
Pedro Algarvio
18d969a674 Adapt the test to the changes made in 3c284b1b6. 2014-04-27 12:35:07 +01:00
Joseph Hall
7b05da5df6 Merge pull request #12291 from skrobul/openstack-keyring
Support storing provider passwords in a keyring instead of plain-text
2014-04-26 07:32:18 -06:00
Marek Skrobacki
524113fc4f fix pylint warnings 2014-04-26 10:21:26 +01:00
Thomas S Hatch
6129ec828d Merge pull request #12281 from terminalmage/issue12209-tests
Add tests for #12209
2014-04-25 20:35:47 -06:00
Erik Johnson
b78e558296 Remove unnecessary except 2014-04-25 18:00:04 -05:00
Erik Johnson
cb81b69abc Fix import 2014-04-25 17:58:41 -05:00
Pedro Algarvio
1a65ee6bc7 In order not to change the arguments order 2014-04-25 23:34:15 +01:00
Erik Johnson
bffb9b5d43 Add skipIf and destructiveTest
These tests must be run as root, and create and destroy a user and
group, so this adds the proper decorators.

Additionally, this wraps the assertions from these tests in a try/except
block that ensures that the temp directory created for this test is
cleaned up.
2014-04-25 17:17:34 -05:00
Erik Johnson
d9fa7c5203 Use new decorators for issue 12209 tests 2014-04-25 17:17:34 -05:00
Erik Johnson
8574d9a19e Use custom user/group for integration tests for #12209
Not all platforms have a "nobody" user, this commit changes these tests
to use a "test12209" user/group for these tests.
2014-04-25 17:17:34 -05:00
Erik Johnson
f73a193c6b Add tests for #12209 2014-04-25 17:17:33 -05:00
Erik Johnson
ad53983a16 Fix refs to with_system_account decorator
This renames this decorator to with_system_user, to go along with
changes in https://github.com/saltstack/salt-testing/pull/14.
2014-04-25 14:03:41 -05:00
Marek Skrobacki
10ce848828 remove hard-dependency on keyring 2014-04-25 18:11:24 +01:00
Marek Skrobacki
7fbb5fcb78 add tests for keyring utils 2014-04-25 17:22:48 +01:00
Joseph Hall
f971ec3af3 Merge pull request #12263 from s0undt3ch/issues/12261-too-many-args-to-docs
Fail soon on too many args to docs
2014-04-25 07:03:39 -06: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
Pedro Algarvio
5b790dbb79 Allow getting stderr from the commands. 2014-04-24 15:42:17 +01:00
Pedro Algarvio
f43dfd5478 Merge pull request #12171 from cachedout/6692
Supervisord mod_watch fix
2014-04-24 13:21:26 +01:00
Pedro Algarvio
f07e614a31 Adapt the tests to the new deprecation output. 2014-04-24 11:32:46 +01:00
Pedro Algarvio
7a5604fddd Bump deprecations to Lithium 2014-04-24 10:15:31 +01:00
Pedro Algarvio
d5c90480fb Bump deprecations to Lithium 2014-04-24 10:15:01 +01:00
Pedro Algarvio
33f361e99d Don't use the deprecated keyword argument 2014-04-24 09:06:28 +01:00
Mike Place
637c372aae Fix bug with mod_watch in supervisor modules
* Also adds __virtual__ support to supervisord exec module

* Closes #6692

Remove uneeded module.

Don't run supervisord tests without supervisord

Fix state test.

Pulled in an old pylint breakage.

Conflicts:
	salt/modules/saltutil.py
2014-04-23 16:14:12 -06:00
Thomas S Hatch
ff30f81933 Merge pull request #12135 from jacksontj/job_cache
Master_job_caches
2014-04-23 13:55:51 -06:00
Pedro Algarvio
a564874bb0 Since we now include the code name, check for presence of the commit info instead. 2014-04-23 13:25:43 +01:00
Erik Johnson
74180b1da0 More test fixes 2014-04-21 20:36:23 -05:00
Erik Johnson
c41526c913 Fix tests to match new error messages 2014-04-21 20:07:06 -05:00
Mike Place
9ac6e8e150 Remove test.
Also pass makedirs correctly.
2014-04-21 10:30:27 -06:00
Thomas Jackson
05f0969ee8 Fix the output now that we are using the default output (nested) instead of hard coding it to yaml 2014-04-19 15:59:13 -07:00