valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
27,812 Commits 24 Branches 182 Tags 341 MiB
d018d9ec54
Commit Graph

2096 Commits

Author SHA1 Message Date
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
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
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