valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
30,591 Commits 24 Branches 182 Tags 341 MiB
0b40580f7d
Commit Graph

2301 Commits

Author SHA1 Message Date
Thomas S Hatch
276a1f1e05 Fix file perm checker tests 2014-03-17 11:59:09 -06:00
Thomas S Hatch
05726ff088 Merge branch 'pyobjects_loader_and_map' of git://github.com/borgstrom/salt into borgstrom-pyobjects_loader_and_map 
Conflicts:
	salt/utils/pyobjects.py
 2014-03-17 10:23:43 -06:00
rallytime
6a54a92aa9 Removed list groups test 2014-03-17 09:55:41 -06:00
rallytime
d3bc7c800c mac_user integration tests 2014-03-17 09:02:16 -06:00
Erik Johnson
37bf8ee768 Change package used for opensuse integration pkg tests 2014-03-14 11:50:32 -05:00
Colton Myers
ea800935d7 Switch git clones to saltstack/salt-test-repo (super small repo) 
Was previously cloning bootstrap a few times, and our salt repo once
(which is a large repo).  Should speed up the git tests substantially.
 2014-03-14 09:45:17 -06:00
Thomas S Hatch
d522a78926 Merge pull request #11214 from rallytime/mac_user_test 
pylint fixes
 2014-03-13 17:37:42 -06:00
rallytime
ad6bcbdd73 pylint fixes 2014-03-13 14:29:58 -06:00
Pedro Algarvio
4c7d06a64a Test ImmutableList sum 2014-03-13 20:10:44 +00:00
Mike Place
72749d70ac Merge pull request #11213 from rallytime/mac_user_test 
Refactored and wrote more mac_user integration tests
 2014-03-13 13:57:51 -06:00
rallytime
aacf7ee6ac Ah! Almost forgot the destructive test decorators 2014-03-13 13:55:32 -06:00
rallytime
1dd6fd45bc Pylints 2014-03-13 13:51:58 -06:00
rallytime
69d974d764 Refactored and wrote more mac_user integration tests 2014-03-13 13:47:01 -06:00
Thomas S Hatch
d1bb711860 Merge pull request #11201 from galet/ini-missing-rows 
ini_manage module: Preserve empty lines between options and comments.
 2014-03-13 10:15:01 -06:00
Pedro Algarvio
2f3d7bd6cc Merge branch 'develop' of github.com:saltstack/salt into hotfix/immutable-lists-sum 2014-03-13 16:03:50 +00:00
Michal Galet
a50ee98e9b Cosmetic: Fix missing newline at the end of file. 2014-03-13 13:32:52 +01:00
Michal Galet
9093cf0364 ini_manage module: Preserve empty lines between options and comments. 2014-03-13 12:46:17 +01:00
Mathieu Le Marec - Pasquet
ab0b465d3e Yet another fix for ImmutableProxyList 
This is related to #11088, #11035, #11003, #11190.
 2014-03-13 10:53:55 +01:00
Evan Borgstrom
4aec18b1e0 Refactor and modularize of the loader interface, adding Map to pyobjects 
The problem with using the loaded states (see commit cc8539f) is that
you can end up in situations where a particular state doesn't exist for
whatever reason. This prevents you from building states freely (see
ticket #10918).

The refactor focuses on breaking out the `gen_functions` function into a
number of smaller reusable functions so that pyobjects can load all of
the states and still process `__virtual__()` and `__virtualname__` in a
way that makes sense for building states. After all pyobjects is just
compiling a high state data structure, if a state is available or not
during application time is up to the minion.

As part of this refactor I have also updated all of the inline comments
in the loader to be more consistent with the way things are actually
working now (such as `__virtual__()` returning a string being
deprecated).

There are also some pep8 fixes to the loader file.

Fix #10918

----

This also adds a new feature to pyobjects named `Map`, which allows for
definition of grain dependent data in a pythonic way -- using inner
classes.

----

Lastly this ditches the instance based registry and instead uses a class
based approach like a singleton.
 2014-03-12 22:23:32 -04:00
Pedro Algarvio
e1c33dcad6 Revert "Stop running the test while it's failing" 
This reverts commit a084303c91.
 2014-03-12 21:52:08 +00:00
Thomas S Hatch
ef0f3203e3 Add file type 2014-03-12 10:47:30 -06:00
Thomas S Hatch
0a0f4cdd8d Merge pull request #11149 from ze42/dev_replace 
file.append(append/prepend_if_not_found)
 2014-03-12 09:30:28 -06:00
Thomas S Hatch
0cbfb2e30a Merge pull request #11148 from galet/ini-missing-rows 
Fix ini_manage to preserve empty options
 2014-03-12 09:29:37 -06:00
Adrien "ze" Urban
68e88db671 file.replace(append_if_not_found) - test units 2014-03-12 10:44:00 +01:00
Thomas S Hatch
1c909c0ea9 Merge pull request #11155 from rallytime/mac_user_test 
Mac user integration test
 2014-03-11 23:17:03 -06:00
rallytime
b9ea2d09f4 pylint fixes 2014-03-11 21:45:41 -06:00
Michal Galet
5e99f1a60b Fixing formatting in ini_manage_test.py. 2014-03-11 23:41:53 +01:00
Michal Galet
99fcd43135 Fixing ini_manage module to preserve empty options. Added unit test for module to verify there are no regressions. 2014-03-11 23:35:01 +01:00
rallytime
edfd0f4a99 Wrote a mac_user integration test 2014-03-11 15:26:16 -06:00
Thomas S Hatch
112542ca51 Merge pull request #11137 from ze42/dev_blockreplace 
blockreplace - ensure newline before appending
 2014-03-11 14:06:19 -07:00
Mathieu Le Marec - Pasquet
66e98055c9 cron: fix tests 2014-03-11 18:13:06 +00:00
Adrien "ze" Urban
ec314d4ef6 file.blockreplace(append_if_not_empty): test for missing \n at EOF 2014-03-11 18:46:01 +01:00
Thomas S Hatch
5676968524 Merge pull request #11120 from makinacorpus/cronfix 
cron: Fix for #10959
 2014-03-11 09:02:21 -07:00
Thomas S Hatch
84d5c525b0 Merge pull request #10972 from s0undt3ch/hotfix/force-virtual-booleans 
The `__virtual__()` function should only return strings on renames.
 2014-03-11 08:51:11 -07:00
Mathieu Le Marec - Pasquet
cfa93f9f92 cron: Fix for #10959 2014-03-11 09:18:11 +00:00
Pedro Algarvio
a084303c91 Stop running the test while it's failing 2014-03-10 23:52:38 +00:00
Pedro Algarvio
1ef4cd11cb Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
fd1bab0d8d Add test case which triggers #11003. 2014-03-10 17:47:22 +00:00
rallytime
b7d4e2ed96 Started some integration tests for mac_user module 2014-03-10 11:19:40 -06:00
Thomas S Hatch
790edd07ac Merge pull request #11024 from whiteinge/import_text 
Added load_text filter and import_text tag to Jinja environment
 2014-03-07 14:06:19 -08:00
Thomas S Hatch
8c6c608958 Merge branch 'serializers' of git://github.com/johnnoone/salt into johnnoone-serializers 
Conflicts:
	doc/topics/yaml/index.rst
 2014-03-07 14:53:03 -07:00
Seth House
c94cd38c65 Added unit test for the import_text tag 2014-03-06 17:30:47 -08:00
Mike Place
abf2487947 Merge pull request #11009 from rallytime/brew_test 
Brew unit tests done for now
 2014-03-06 13:29:31 -07:00
rallytime
b2b05f0e9d Brew unit tests done for now 2014-03-06 13:01:02 -07:00
Thomas S Hatch
9c2f02a7ef Merge pull request #10995 from jacksontj/develop 
Fix check if the item doesn't exist in the ttl cache
 2014-03-06 04:49:09 -08:00
Thomas S Hatch
e59fde745d Merge pull request #10983 from rallytime/brew_test 
More brew module unit tests
 2014-03-06 04:39:00 -08:00
Thomas Jackson
96c76f7a73 Add some unit tests for cache object 2014-03-05 18:12:20 -08:00
rallytime
f5f089b7a6 pylint fixes 2014-03-05 13:56:30 -07:00
rallytime
543a6943fc More brew module unit tests 2014-03-05 13:08:57 -07:00
Mike Place
697f4bf1ce Fix Jenkins test failure 
Add build_shar.sh to list of files permitted to be u+x in the git
repo.
 2014-03-05 10:59:54 -07:00
Thomas S Hatch
6d23350d85 Merge pull request #10910 from rallytime/brew_test 
A couple more brew tests
 2014-03-03 13:44:55 -08:00
rallytime
25c77b2559 A couple more brew tests 2014-03-03 13:51:42 -07:00
Thomas S Hatch
e32cf6e74f Merge pull request #10861 from georgemarshall/utils_fix 
Fix utils.option to recurse dict keys
 2014-03-03 10:34:28 -08:00
Mathieu Le Marec - Pasquet
b62c680b81 salt.modules.postgres: Quote all extension work 
- Fix regressions in tests introduced by @ticosax (nevermind @ticosax i
  also regulary breaks them :p)
- Quote also alters.
 2014-03-02 10:17:46 +00:00
George Marshall
8f66db2e0f Teach utils.option to fail so that it can succeed 2014-02-28 21:57:03 -08:00
Mike Place
5ce9c2cdf3 Pylint var names. 2014-02-28 00:05:03 -07:00
Mike Place
d39795dc3d Merge pull request #10847 from rallytime/brew_test 
Started writing brew unit tests
 2014-02-27 23:30:39 -07:00
rallytime
48e3f718ff pylint fixes 2014-02-27 21:33:50 -07:00
rallytime
00b8c3dc70 Started writing brew unit tests 2014-02-27 17:03:08 -07:00
Thomas S Hatch
52d3e6d83f Merge pull request #10839 from borgstrom/pyobjects_ids 
Pyobjects ids
 2014-02-27 15:29:06 -07:00
Mike Place
6a318faee3 Merge pull request #10836 from rallytime/mac_group_test 
Wrote the rest of the mac_group unit tests
 2014-02-27 14:13:58 -07:00
Evan Borgstrom
cc8e25e316 Rebuild StateRegistry storage so IDs across modules work 
As it stands the following will fail as we didn't allow duplicate IDs
under any circumstances:

    with Pkg.installed("nginx"):
    	Service.running("nginx")

This commit changes the way the StateRegistry stores states to allow the
above example to work properly.

Now it behaves much more closely to the YAML + Jinja renderer.
 2014-02-27 15:52:14 -05:00
rallytime
86f24555c5 pylint fixes 2014-02-27 13:05:16 -07:00
Evan Borgstrom
2e6371f65b Add test for duplicates, now to fix it 2014-02-27 15:04:27 -05:00
Thomas S Hatch
3813934f4a http://www.youtube.com/watch?v=v7NzBTRzCkg 2014-02-27 12:58:39 -07:00
Thomas S Hatch
b3f99f9833 Merge pull request #10776 from ticosax/fix-states.dockerio.run 
Fix states.dockerio.run
 2014-02-27 12:55:23 -07:00
rallytime
7eed870258 Wrote the rest of the mac_group unit tests 2014-02-27 12:54:45 -07:00
Mike Place
b94ba19e60 Warn us about suspect perms. 
I've found cases where people have been setting permissions for files
and then those permissions are being pushed into git. This is annoying
at best and potentially dangerous at worst.

This test walks the tree and warns us about anything that's out of
order.
 2014-02-27 11:33:27 -07:00
Thomas S Hatch
98360d799c Merge pull request #10741 from makinacorpus/fixcron 
Support multiline cron comments
 2014-02-26 09:59:28 -07:00
Nicolas Delaby
c6b5ade054 declare encoding 2014-02-26 16:31:38 +01:00
Nicolas Delaby
853b5f4a8f Add test for states.dockerio.run 2014-02-26 15:42:56 +01:00
Erik Johnson
b717319e82 Add "if __name__ == '__main__'" section to mac_group_test.py 2014-02-26 00:51:43 -06:00
Pedro Algarvio
695cf1aace {a, b} set() notation is not available in Python 2.6 
Allow running the testcase filename alone.
 2014-02-26 05:11:01 +00:00
Mike Place
0c5e074a04 Merge pull request #10745 from rallytime/mac_group_test 
Started writing unit tests for mac_group
 2014-02-25 14:44:45 -07:00
rallytime
bced074647 Started writing unit tests for mac_group 2014-02-25 14:02:54 -07:00
Thomas S Hatch
1a91817221 Merge pull request #10734 from rallytime/mac_user_test 
More mac_user tests
 2014-02-25 13:31:31 -07:00
Mathieu Le Marec - Pasquet
f9a116ee9c Support multiline cron comments 
This fixes #10721.
 2014-02-25 19:52:47 +00:00
rallytime
c58a6a53a3 More mac_user tests 2014-02-25 11:59:34 -07:00
Erik Johnson
6e50575049 Remove extraneous UTF8 coding line 2014-02-25 12:16:23 -06:00
Erik Johnson
f54ed36016 Add comment about importance of empty line 2014-02-25 11:55:10 -06:00
Pedro Algarvio
96849c526a Merge pull request #10724 from terminalmage/tests 
Add three tests for minion_id generation
 2014-02-25 09:23:59 +00:00
Erik Johnson
69ce44ed6f Add more get_id tests + some DRY fixes 2014-02-25 02:27:35 -06:00
Pedro Algarvio
ce9f923190 Test is now fixed. 2014-02-25 01:59:49 -06:00
Pedro Algarvio
284a2abfcb Get mock_open working. 
Kind of since we're not using `mock_open` from the mocked library. Were
actually using the recipe to mock the builtin open as seen on http://goo.gl/dxMwPO
 2014-02-25 01:59:30 -06:00
Erik Johnson
474e7590b9 Add test for salt.config.get_id() when /etc/hosts is parsed 
This is a WIP, the mocking isn't quite working yet.
 2014-02-24 23:46:00 -06:00
Erik Johnson
e720b57fcf Merge pull request #10701 from rallytime/mac_user_test 
Wrote more mac_user tests, found and fixed bug
 2014-02-24 15:22:17 -06:00
rallytime
500c17feef Wrote more mac_user tests, found and fixed bug 2014-02-24 12:33:28 -07:00
Pedro Algarvio
1354c212ee Merge pull request #10659 from rallytime/mac_user_test 
Even more mac_user tests!
 2014-02-22 17:21:57 +00:00
rallytime
4e1c73f9e9 Even more mac_user tests! 2014-02-21 16:11:09 -07:00
Mike Place
64f07ebc38 Merge pull request #10651 from rallytime/mac_user_test 
more mac_user tests
 2014-02-21 13:56:11 -07:00
rallytime
4a5bbd0c1d more mac_user tests 2014-02-21 13:49:17 -07:00
Thomas S Hatch
bde33497d2 Merge pull request #10645 from rallytime/mac_user_test 
Test fixes
 2014-02-21 12:09:46 -07:00
rallytime
5a80abeaee Test fixes 2014-02-21 11:13:38 -07:00
Xavier Barbosa
a3b87d1981 a little bit of lint 2014-02-21 13:49:54 +01:00
Xavier Barbosa
9f39d4171b added reset tag 2014-02-21 09:52:31 +01:00
Mike Place
f325ddc1a4 Merge pull request #10632 from rallytime/mac_user_test 
More mac_user tests
 2014-02-20 16:48:08 -07:00
rallytime
ed614934f7 More mac_user tests 2014-02-20 14:25:38 -07:00
Thomas S Hatch
c8abd5a56a Merge pull request #10629 from makinacorpus/saltcallreturn 
salt-call now returns jobs to master
 2014-02-20 13:52:29 -07:00
Evan Borgstrom
796efac44f Update tests to use new syntax 2014-02-20 15:19:42 -05: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
Thomas S Hatch
7a3bf8aa85 Merge pull request #10600 from borgstrom/pyobjects_saltobject 
Adding a object interface to __salt__ & __pillar__ (pyobjects)
 2014-02-20 10:17:35 -07:00
Thomas S Hatch
6839eb1a56 fix cron test error in lint 2014-02-20 10:05:56 -07:00
Thomas S Hatch
a93bd0f596 Merge pull request #10593 from makinacorpus/cron 
cron: better behavior of crontabs tracking
 2014-02-20 10:04:59 -07:00
Xavier Barbosa
85a5c9e617 ensure that str are yaml friendly 2014-02-20 17:50:49 +01:00
Evan Borgstrom
7ed0eb576e Switch double to single quotes, fix pylint warning 2014-02-20 10:23:57 -05:00
Xavier Barbosa
ad9734e78f implement aggregation 2014-02-20 13:57:37 +01:00
Xavier Barbosa
9d32696939 implement serializers 2014-02-20 12:00:21 +01:00
Evan Borgstrom
adae60f44a Adding a object interface to the __salt__ dictionary 
This is another suggestion from @mgwilliams. It adds an object to the
sls file scope named Salt, which dispatches its attributes to the
__salt__ dictionary.

For example, the following two lines are functionally the same:

    ret = Salt.cmd.run(bar)
    ret = salt['cmd.run'](bar)
 2014-02-19 20:38:02 -05:00
Thomas S Hatch
2bb2d956c1 Merge pull request #10595 from rallytime/mac_user_test 
Started testing mac_user module
 2014-02-19 15:16:33 -07:00
Mathieu Le Marec - Pasquet
bfa176f110 cron: complete matching rework 2014-02-19 22:44:34 +01:00
rallytime
1e5d502d8a Started testing mac_user module 2014-02-19 14:10:52 -07:00
Mathieu Le Marec - Pasquet
90dc963c1c cron: better behavior of crontabs tracking 2014-02-19 20:39:44 +01:00
Joseph Hall
b6ea15b742 Merge pull request #10542 from rallytime/dnsutil_test 
Final tests for dnsutil
 2014-02-18 13:17:41 -07:00
rallytime
56e89ac1f2 final tests for dnsutil 2014-02-18 12:36:09 -07:00
Thomas S Hatch
7d2d219560 Merge pull request #10539 from rallytime/dnsutil_test 
Dnsutil test
 2014-02-18 11:13:31 -07:00
Thomas S Hatch
a2a4ead49c Merge pull request #10517 from borgstrom/pyobjects 
Add Pyobjects (formerly NaCl) to Salt
 2014-02-18 11:12:01 -07:00
rallytime
5d38a2faa3 Merge branch 'develop' of https://github.com/saltstack/salt into dnsutil_test 2014-02-18 10:48:30 -07:00
rallytime
94128532d2 started new dnsutil_test 2014-02-18 10:45:43 -07:00
Evan Borgstrom
e80e39032e Support including & extending 2014-02-17 21:31:06 -05:00
Evan Borgstrom
72cb2ab35b Add pyobjects tests 2014-02-17 19:54:56 -05:00
Thomas S Hatch
81790838fa tmp stub out test until we can find a better home for it 2014-02-17 14:31:41 -07:00
Thomas S Hatch
85eed30167 Merge pull request #10409 from Vye/gitfs_fix_url_change 
Adds support for updating cached git repo url.
 2014-02-17 14:30:42 -07:00
Pedro Algarvio
7a42bf24fc Jinja's sequence filter does not need to be an extension. 2014-02-15 17:26:35 +00:00
Thomas S Hatch
14e79ea857 Merge pull request #10379 from johnnoone/jinja-filter 
fix jinja SequenceExtension
 2014-02-14 22:39:30 -07:00
Thomas S Hatch
67205e2106 whitespace 2014-02-14 16:34:03 -07:00
Thomas S Hatch
ef26e5efc8 Merge pull request #10450 from rallytime/dnsutil_test 
One more dnsutil test
 2014-02-14 13:54:24 -07:00
rallytime
647122cc55 lint fixes 2014-02-14 13:44:36 -07:00
rallytime
e8fbd5cd01 import fix 2014-02-14 13:06:58 -07:00
rallytime
9c4dd8232a Merge branch 'develop' of https://github.com/saltstack/salt into dnsutil_test 2014-02-14 12:54:00 -07:00
Thomas S Hatch
e6b0a27281 Merge pull request #10403 from terminalmage/10367 
dig.SPF fixes
 2014-02-14 12:52:00 -07:00
rallytime
d03b816c5b Merge branch 'develop' of https://github.com/saltstack/salt into dnsutil_test 2014-02-14 12:45:22 -07:00
rallytime
20cb9de36f One more dnsutil test 2014-02-14 12:42:59 -07:00
Thomas S Hatch
fd5500724b Merge pull request #10229 from kaithar/feature/enhanced-mysql-pillar 
Proposal: enhanced mysql pillar
 2014-02-14 12:40:06 -07:00
Erik Johnson
a263a088e5 fix pylint (add blank line) 2014-02-13 13:34:53 -06:00
Erik Johnson
90304e05ee Fix dig tests 
Added a side_effect function to allow for testing of recursive functions
in the SPF tests. Also enabled all skipped tests as they now all pass.
 2014-02-13 12:38:11 -06:00
Xavier Barbosa
d7eb1d2f9d fix jinja SequenceExtension 2014-02-13 08:59:29 +01:00
Vye Wilson
e2b1381185 Adds support for updating cached git repo url. 
Fixes #10408
 2014-02-12 18:58:42 -08:00
Erik Johnson
5c446c50dd Fixed unit tests 
Had to skip two tests because I don't know how to mock properly when
recursion is involved.

Also made some PEP8 fixes.
 2014-02-12 20:17:52 -06:00
Thomas S Hatch
ae961b689d remove unused import 2014-02-12 16:02:21 -07:00
rallytime
661ed0ef2d Started testing dnsutil 2014-02-12 14:53:58 -07:00
rallytime
2035e7d153 Added S0undt3ch's skipIf suggestion 2014-02-12 11:04:35 -07:00
rallytime
1b55edd4fb We cannot use the requires_salt_modules decorator because we do not inherit from an integration test class. 2014-02-12 10:36:22 -07:00
Pedro Algarvio
9452fa25a3 Skip tests if mock not available, make use of helpers 2014-02-12 15:42:51 +00:00
Pedro Algarvio
059ed16d02 Remove unused import 2014-02-12 15:37:15 +00:00
Pedro Algarvio
7465f0511f Remove unused import 2014-02-12 15:36:17 +00:00
Pedro Algarvio
c15526852a Remove unused imports 2014-02-12 15:35:14 +00:00
Pedro Algarvio
720a094142 Fix lint issues and make use of the helpers. 
Double to single quotes.
 2014-02-12 15:32:55 +00:00
Thomas S Hatch
a7baf5936c Revert "add sequence filter for jinja" 
This reverts commit cbe04b8231.
 2014-02-11 15:59:22 -07:00
Thomas S Hatch
3cbe200eb1 Merge pull request #10361 from johnnoone/jinja-filter 
add sequence filter for jinja
 2014-02-11 15:38:32 -07:00
Thomas S Hatch
5239c8b192 Merge pull request #10337 from bemehow/blockdev 
blockdev state, module and test
 2014-02-11 15:25:23 -07:00
Mike Place
06a8ae4fc4 Merge pull request #10369 from rallytime/dig_test 
all methods in dig.py are tested
 2014-02-11 15:11:55 -07:00
rallytime
c2f8f2bfa0 all methods in dig.py are tested 2014-02-11 15:07:42 -07:00
Mike Place
012e4ed900 Merge pull request #10366 from rallytime/dig_test 
More dig tests
 2014-02-11 14:33:17 -07:00
rallytime
446cf9b6d4 code cleanup 2014-02-11 14:30:07 -07:00
rallytime
f14469bb77 small lint fix 2014-02-11 14:24:10 -07:00
rallytime
555049dd37 More dig tests 2014-02-11 14:19:16 -07:00
Xavier Barbosa
cbe04b8231 add sequence filter for jinja 2014-02-11 20:42:40 +01:00
Mike Place
c869ce6319 Merge pull request #10357 from rallytime/dig_test 
Wrote more Dig tests
 2014-02-11 12:10:23 -07:00
Nicole Thomas
9c0016a68f More tests on dig.py and found a bug in check_ip function (ipv6 regex) 2014-02-11 11:59:18 -07:00
Erik Johnson
98bcd26139 Fix pkg test with dots in filename 
The package here is much smaller and should install quicker than the old
one.
 2014-02-11 11:22:34 -06:00
Thomas S Hatch
8ce74e0378 disable dot test, need to find another package 2014-02-11 09:41:10 -07:00
Nicole Thomas
d02ba6e3aa Spelling and typos. 2014-02-11 09:15:57 -07:00
Michal Bicz
6ad4415ac1 blockdev state, module and test 2014-02-11 00:11:29 -08:00
Mike Place
c99449c0f6 Remove whitespace 2014-02-10 15:43:57 -07:00
Mike Place
6259f55a4c Dig tests 2014-02-10 15:38:14 -07:00
Thomas S Hatch
17edf0b1a7 Merge pull request #10288 from s0undt3ch/hotfix/lint 
Lint Fixes
 2014-02-10 12:22:09 -07:00
Thomas S Hatch
3b045d7719 Merge pull request #10319 from plastikos/issue-10318 
Do not fail if the system does not support IPv6
 2014-02-10 12:10:20 -07:00
Thayne Harbaugh
08ed0f0e1e Do not fail if the system does not support IPv6 
Fixes: #10318
 2014-02-10 11:01:34 -07:00
Pedro Algarvio
362e162496 Remove un-necessary code 2014-02-10 15:10:19 +00:00
Pedro Algarvio
ec5614bd08 Remove the vim jedi output from the code 2014-02-10 13:28:28 +00:00
Pedro Algarvio
74dae3b842 And, as a last resort, kill the process after failing to terminate them. 2014-02-10 13:11:09 +00:00
Pedro Algarvio
8561be1fee For output consistency. 2014-02-09 00:21:18 +00:00
Pedro Algarvio
cfff985043 Remove unused imports 2014-02-08 08:09:48 +00:00
Pedro Algarvio
2d5aafa12b Remove unused imports 2014-02-08 08:09:13 +00:00
Pedro Algarvio
24fdc6f688 Ignore unused imports 2014-02-08 08:08:49 +00:00
Pedro Algarvio
abedf1978e Remove unused imports 2014-02-08 08:08:16 +00:00
Pedro Algarvio
22908278a4 Remove unused imports 2014-02-08 08:07:38 +00:00
Pedro Algarvio
140eb8af2b Remove unused imports 2014-02-08 08:07:17 +00:00
Pedro Algarvio
8c8effc452 Ignore unused imports 2014-02-08 08:05:42 +00:00
Pedro Algarvio
bd3b8d9fa1 Remove unused imports 2014-02-08 08:05:15 +00:00
Pedro Algarvio
8d45812f34 Remove unused imports 2014-02-08 08:04:19 +00:00
Pedro Algarvio
e20715c2ac Ignore unused imports 2014-02-08 08:03:23 +00:00
Pedro Algarvio
c00dafd7fb Remove unused imports 2014-02-08 08:02:29 +00:00
Pedro Algarvio
ec75329a88 Ignore and remove unused imports 2014-02-08 08:01:12 +00:00
Pedro Algarvio
cbe4c360b0 Remove unused imports 2014-02-08 07:59:57 +00:00
Pedro Algarvio
b2ff725c82 Remove unused imports 2014-02-08 07:59:03 +00: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
2a31e4e38b Remove unused imports & Skip if no mock available 2014-02-08 07:54:31 +00:00
Pedro Algarvio
6144ac22f7 Remove unused imports & Skip if no mock available 2014-02-08 07:51:28 +00:00
Pedro Algarvio
d67488775e Remove unused imports & Skip if no mock available 2014-02-08 07:50:12 +00:00
Pedro Algarvio
7acf994c46 Remove unused imports 2014-02-08 07:47:17 +00:00
Pedro Algarvio
3fceb028eb Ignore and remove unused imports 2014-02-08 07:46:50 +00:00
Pedro Algarvio
b60a0543ce Skip test if binaries missing 2014-02-08 07:45:25 +00:00
Pedro Algarvio
3e0780fa78 Remove unused imports 2014-02-08 07:43:30 +00:00
Pedro Algarvio
8e0233bbb8 Remove unused imports 2014-02-08 07:42:32 +00:00
Pedro Algarvio
fd306ea0b0 We need a bigger timeout, salt's repo is pretty big now. 2014-02-08 03:07:30 +00:00
Pedro Algarvio
bb9e431491 No need for the line breaks 2014-02-08 00:33:26 +00:00
Pedro Algarvio
c8010bbf4f We don't narrow check's to state calls no more. 2014-02-07 18:01:09 +00:00
Pedro Algarvio
420fe3cc50 Let's try without passing the --out option. 2014-02-07 18:00:40 +00:00
Pedro Algarvio
499a508a0f Use the correct .format() index. 2014-02-07 10:25:27 +00:00
Thayne Harbaugh
f9d790a389 unit.modules.virtualenv_test.VirtualenvTestCase.test_python_argument 
work with non-standard interpreter locations

  Fixes #10251
 2014-02-06 17:01:40 -07:00
Seth House
b336c48b8c Pass the minionswarm user through to salt-key 
Otherwise salt-key would fail with a user warning and not write the key
which would then cause the minionswarm to fail when referencing the key.
 2014-02-06 10:59:34 -07:00
Seth House
d779354351 Moved grabbing/overriding the minionswarm user to parse-time 
This change provides a single source of truth for what user the swam
will be running as.
 2014-02-06 10:59:34 -07:00
Daniel Bradshaw
95e32ec52b Support for coercing dicts to lists. 
Specify fields to be hit with dict.values()
 2014-02-06 05:14:52 +00:00
Kaithar
41714c3adb Test cases 2014-02-06 05:14:52 +00:00
Pedro Algarvio
5bd6108582 Merge pull request #10217 from s0undt3ch/issues/10198-missed-saltenv 
Provide tests cases for #10197 and #10198
 2014-02-05 23:19:19 +00:00
Pedro Algarvio
b66418e263 Provide tests cases for #10197 and #10198 2014-02-05 21:56:08 +00:00
Thayne Harbaugh
446599adc5 Correctly grain for test "os" => "os_family": issue-10215 2014-02-05 14:38:45 -07:00
Pedro Algarvio
c304660f88 Fix typo 2014-02-05 02:32:04 +00:00
Thomas S Hatch
a85838b4ff Merge pull request #10188 from nshalman/smartos-cron-fix 
Fix cron state to work on SmartOS
 2014-02-04 16:16:09 -08:00
Thomas S Hatch
39acd91a73 Merge pull request #10182 from s0undt3ch/hotfix/kill-stalled-state-jobs 
Show and kill stalled states jobs when running the tests.
 2014-02-04 16:09:04 -08:00
Pedro Algarvio
74376c40ef Include what happened in the returned list. 2014-02-04 22:49:13 +00:00
Pedro Algarvio
6045f0901f Try to match some more stalled functions. 2014-02-04 22:36:39 +00:00
Nahum Shalman
b1e81a5ebb Fix cron state to work on SmartOS 
SmartOS and Solaris are both in the Solaris os_family
If we use that grain, the module should work on SmartOS
 2014-02-04 17:00:18 -05:00
Pedro Algarvio
6248850055 Show and kill stalled states jobs when running the tests. 2014-02-04 21:07:13 +00:00
John Anderson
e1fa6955ff Tighten up regex a bit 2014-02-04 11:34:18 -07:00
Mike Place
8a0167e72b Loosen regex to allow for quoting quirk on Ubuntu 10.x 2014-02-04 18:00:48 +00:00
Joseph Hall
6b39fbec81 Merge pull request #10137 from s0undt3ch/hotfix/rabbitmq-virtual-fixes 
rabbitmq module and test fixes/simplifications
 2014-02-03 04:33:08 -08:00
Pedro Algarvio
69d0f907f9 Make use of the print() function. 2014-02-03 11:07:43 +00:00
Pedro Algarvio
378a9d5b21 Simplify test requirements. 2014-02-03 10:55:44 +00:00
Pedro Algarvio
f417bb5b5a Minor cosmetic change for consistency. 2014-02-03 10:31:13 +00:00
Mathieu Le Marec - Pasquet
3a209d4c07 Bunch of safeguards for utf8 errors in buildout module 2014-02-02 04:18:32 +01:00
Erik Johnson
35c397d14b Fix test failures 
http://jenkins.saltstack.com/job/salt-rs-rhel5/1511/
 2014-02-01 16:51:48 -06:00
Ted Strzalkowski
488dd52e2c Added unit tests for new psutil features. 2014-02-01 13:22:44 -08:00
Thomas S Hatch
0be2ce9132 Merge pull request #10048 from hulu/auth_test_update 
Test case where auth loader is called with no auth type specified
 2014-01-31 09:41:43 -08:00
Thomas S Hatch
ce1f305745 Merge pull request #10031 from kaithar/feature/test-fixes 
Feature/test fixes
 2014-01-31 09:38:38 -08:00
Thomas S Hatch
c837aedd00 Merge pull request #10004 from rgbkrk/patch-2 
Use __opts__.get
 2014-01-31 09:37:04 -08:00
Thomas S Hatch
ae05a266ca Merge pull request #9973 from penta-srl/archive-unzip-add-update-option 
unzip: added options parameters
 2014-01-31 09:26:27 -08:00
Pedro Algarvio
daf94a58b7 Remove trailing white-space. 2014-01-29 22:48:48 -07:00
David Lindquist
a3ceed03c8 Formatting change 2014-01-29 20:19:43 -08:00
David Lindquist
c3c04afdaf Test a case where the loader auth doesn't have the auth type 2014-01-29 20:19:43 -08:00
David Lindquist
46a0f5b637 Add __main__ to test 2014-01-29 20:19:42 -08:00
Thomas S Hatch
6d5babfa5c whitespace 2014-01-29 20:30:26 -07:00
Thomas S Hatch
a1561ec7e3 Merge pull request #10037 from ipmb/features/nginx_status 
Adds Nginx status module
 2014-01-29 19:29:08 -08:00
Thomas S Hatch
2253feeb41 Merge pull request #10038 from ipmb/features/uwsgi_stats 
Adds uWSGI stats module
 2014-01-29 19:28:56 -08:00
Thomas S Hatch
13e0d53493 Merge pull request #10029 from kaithar/feature/fix-special-bit-perm-test 
Better handling for special bit modes
 2014-01-29 19:20:31 -08:00
Peter Baumgartner
1bdfb0f6a5 Linting 2014-01-29 15:07:45 -07:00
Peter Baumgartner
1fb99d9985 Linting 2014-01-29 15:06:08 -07:00
Peter Baumgartner
e04f6c7b9b Fixes tests 2014-01-29 15:03:17 -07:00
Peter Baumgartner
ae993bd013 Fixes tests 2014-01-29 15:02:50 -07:00
Peter Baumgartner
f04a7d5056 Cleanup 2014-01-29 14:45:06 -07:00
Peter Baumgartner
d7fa363673 Adds uWSGI stats module 2014-01-29 14:40:23 -07:00
Peter Baumgartner
1ac2f67350 Use Salt conventions 2014-01-29 14:23:58 -07:00
Peter Baumgartner
4c515558cf Adds Nginx status module 2014-01-29 14:17:43 -07:00
Daniel Bradshaw
749e4871db Fixing some missing PEP8ness 2014-01-29 19:48:57 +00:00
Daniel Bradshaw
869f980b45 Restore MagicMock as it shouldn't cause any issues. 2014-01-29 18:46:44 +00:00
Daniel Bradshaw
bc967fa3fb Expand tests for manage_mode 2014-01-29 18:46:44 +00:00