Commit Graph

2112 Commits

Author SHA1 Message Date
Thomas S Hatch
6f284aad59 whitespace 2014-03-18 15:51:09 -06:00
Thomas S Hatch
cfc86239bb Merge pull request #11331 from rallytime/mac_group
Integration tests for mac_group module
2014-03-18 15:38:12 -06:00
Thomas S Hatch
50d2239c96 Merge pull request #11329 from cachedout/event_listen_func
New flag for watching minion returns by function.
2014-03-18 15:37:42 -06:00
rallytime
761a774424 Integration tests for mac_group module 2014-03-18 14:34:36 -06:00
Mike Place
2752e4b019 Duh. Check func. 2014-03-18 14:10:51 -06:00
Mike Place
d4738b6352 New flag for watching minion returns by function. 2014-03-18 13:49:47 -06:00
rallytime
813920b092 Merge branch 'develop' of https://github.com/saltstack/salt into mac_group 2014-03-18 13:11:42 -06:00
rallytime
f2cff53756 Check if gid exists before adding group and associated tests 2014-03-18 13:02:20 -06:00
Thomas S Hatch
d3c28e8b08 Merge pull request #11302 from cro/add_file_mode_tests
Add tests to verify that file.managed will set permissions correctly on existing files.
2014-03-18 10:25:48 -06:00
C. R. Oldham
6c60f17751 Add two tests for checking file permissions when file is already existing 2014-03-17 14:25:17 -06:00
rallytime
42ae77f181 destructive tests 2014-03-17 13:34:05 -06:00
rallytime
29cd475d30 clean-up after changing user info tests 2014-03-17 13:16:45 -06:00
rallytime
4a8ac5fc51 Merge branch 'develop' of https://github.com/saltstack/salt into mac_user_test 2014-03-17 13:12:11 -06:00
rallytime
e2af3aca24 Integration tests for changing user info in mac_user module 2014-03-17 13:10:36 -06:00
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
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
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
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