Commit Graph

2062 Commits

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