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
s8weber
d4b7951da8
fix minion id generation
2014-05-04 19:23:03 -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
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
Thomas S Hatch
05721efb0b
Merge pull request #12115 from cachedout/test_fix
...
Fix stacktrace
2014-04-18 11:28:38 -06:00
Mike Place
205a3ac9c4
Grrrr
2014-04-18 11:25:15 -06:00
Thomas S Hatch
b469b07a16
Merge pull request #12114 from cachedout/test_fix
...
Disable unreliable test.
2014-04-18 10:57:11 -06:00
Mike Place
cb018eced0
Disable unreliable test.
2014-04-18 10:52:09 -06:00
