Commit Graph

948 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
Pedro Algarvio
4c7d06a64a Test ImmutableList sum 2014-03-13 20:10:44 +00: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
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
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
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
Mathieu Le Marec - Pasquet
cfa93f9f92 cron: Fix for #10959 2014-03-11 09:18:11 +00: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
Evan Borgstrom
796efac44f Update tests to use new syntax 2014-02-20 15:19:42 -05: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
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
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
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
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
rallytime
c2f8f2bfa0 all methods in dig.py are tested 2014-02-11 15:07:42 -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
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
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
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
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
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
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
Thayne Harbaugh
446599adc5 Correctly grain for test "os" => "os_family": issue-10215 2014-02-05 14:38:45 -07: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
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
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
Pedro Algarvio
69d0f907f9 Make use of the print() function. 2014-02-03 11:07:43 +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
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
869f980b45 Restore MagicMock as it shouldn't cause any issues. 2014-01-29 18:46:44 +00:00
Michal Galet
7394c2fd2a Added test for salt.modules.file.extract_hash() to verify support for simple Maven checksum file format. 2014-01-29 11:57:47 +00:00
Nicola Marangon
06f77852cb new tests for unzip with options parameters 2014-01-28 09:41:45 +01:00
Alexey Ivanov
d23ff3821e
codespell: grammar nazi
Run codespell[1] against sources.

[1] https://github.com/lucasdemarchi/codespell
2014-01-26 18:41:28 -08:00
Seth de l'Isle
30e9864d66 Removed the mock for config.manage_mode which doesn't seem to be necessary
for any tests to pass but was causing most of the failures for my previous
commit.

Coerced several values to string representations of octal where before they
were sometimes strings and sometimes ints.
2014-01-25 10:51:50 -05:00
Mathieu Le Marec - Pasquet
276e92c4ea postgres: fix password encryption handling 2014-01-24 14:01:14 +01:00
Mathieu Le Marec - Pasquet
3fa92b49fb postgres: Pylint
This fixes #9920
2014-01-24 14:01:13 +01:00
Thomas S Hatch
6b09f5b8fd Merge pull request #9831 from makinacorpus/pgsql
[need review] PGSQL state/mod improvments
2014-01-23 09:07:59 -08:00
Mathieu Le Marec - Pasquet
b8885f8faf buildout: protect against unicodeerrors 2014-01-23 01:11:19 +01:00
Mathieu Le Marec - Pasquet
7039b4c974 postgres: support for extensions 2014-01-21 19:25:35 +01:00
Mathieu Le Marec - Pasquet
47c20d2371 postgres: Group and user managment refactoring:
- stick to postgresql create/alter role
    - handle and detect correctly all roles updates
    - again a whole set of factorization
2014-01-21 19:25:35 +01:00
Mathieu Le Marec - Pasquet
1f39bcfcb4 Fixing tests 2014-01-17 01:59:11 +01:00
Amir Pakdel
421a6200bf Fixed pylint and unit test errors 2014-01-16 09:56:52 -05:00
regilero
e778386f41 MySQL: fix unit test module db_exists check, error is in the test. 2014-01-15 15:59:37 +01:00
Pedro Algarvio
61e217f894 Skip if the tar binary is not found. 2014-01-14 12:36:36 +00:00
Pedro Algarvio
f8f31af3d2 Hardcode mocked unit test virtualenv binary 2014-01-11 12:58:46 -07:00
Mathieu Le Marec - Pasquet
9a9eada12f Better trace for nested jinja errors 2014-01-03 18:16:11 +01:00
Pedro Algarvio
68f26f1176 Don't expect salt to be installed to run the tests.
Use the testing configuration files.
2014-01-03 01:04:43 +00:00
Pedro Algarvio
e55fa8e82f Merge pull request #9542 from cachedout/unit-tests
Unit tests
2014-01-02 16:43:53 -08:00
Pedro Algarvio
baa3a4b8cf Remove hardcoded version, we're regex matching. 2014-01-03 00:40:45 +00:00
Mike Place
cb2abcb796 Pylint fixes. 2014-01-02 16:28:19 -07:00
Mike Place
2e20bf99a3 Client testing
* Minor spelling and doc fixes to client module
 * Unit testing client module.
2014-01-02 16:23:16 -07:00
Pedro Algarvio
e8de5e7077 Don't hardcode the virtualenv binary name 2013-12-31 14:49:22 +00:00
Pedro Algarvio
020d7896c5 Skip if the pip library is not importable. 2013-12-31 14:22:35 +00:00
Pedro Algarvio
d14af796cc Skip tests if virtualenv is not available. 2013-12-31 14:12:02 +00:00
Pedro Algarvio
b03c779718 Don't assume mock and timelib are instaled. 2013-12-31 13:53:37 +00:00
Thomas S Hatch
6961cd8909 Merge pull request #9501 from cachedout/unit-tests
Fix psutil on Arch.
2013-12-30 21:01:29 -08:00
Mike Place
b6aa95d2ab Fix psutil on Arch. 2013-12-30 16:41:45 -07:00
Thomas S Hatch
052ac0497d Merge pull request #9498 from cachedout/unit-tests
Fix RHEL5 zmq unit tests
2013-12-30 13:39:02 -08:00
Mike Place
17dea90f63 Fix RHEL5 zmq unit tests
* Import zmq, check its attr and skip test if necessary.
2013-12-30 14:37:17 -07:00
Thomas S Hatch
2d91584ee8 Merge pull request #9496 from cachedout/unit-tests
Another swing at fixing Postgres tests.
2013-12-30 13:03:07 -08:00
Mike Place
b8e1ddf4bf Another swing at fixing Postgres tests. 2013-12-30 13:28:51 -07:00
Thomas S Hatch
5eaca79810 Revert "Better trace for nested jinja errors"
This reverts commit 99a2791917.
2013-12-30 11:32:53 -07:00
Thomas S Hatch
1b562cb785 Merge pull request #9409 from makinacorpus/test-trace
Better trace for nested jinja errors
2013-12-30 09:57:50 -08:00
Thomas S Hatch
4326a14322 Merge pull request #9480 from cachedout/unit-tests
Unit tests
2013-12-28 21:11:02 -08:00
Mike Place
94591d7e2d Fix unit tests for Postgres on some platforms
* Fix for inconsistent behavior wherein systems will use varying escaping behavior for quotes and double-quotes. (Most notably, Ubuntu 10 for some oddball reason.

  * Reformatting.
2013-12-28 17:16:54 -07:00
Mike Place
4b7148a0f5 Don't test deprecated function.
* utils.memoize has been moved to salt.utils.decorators. Don't test it here.
2013-12-27 13:28:42 -07:00
Pedro Algarvio
4607d38cd4 We're mock'ing, it's ok to ignore the PyLint warning. 2013-12-27 17:56:31 +00:00
Thomas S Hatch
8e3e4ae744 Merge pull request #9457 from cachedout/unit-tests
Test framework updates
2013-12-27 09:01:30 -08:00
Pedro Algarvio
0fb5be304c Add required ending new-line 2013-12-26 18:51:30 +00:00
Mike Place
f2f7e9f537 Handle invalid master address in minion config
Gracefully exit the minion while informing the user of the cause of the error if the IP address of the master is malformed such that it can not even be dealt with by Python's socket module.

Unit testing for the above condition.

Closes #9440.

Remove suprious debugging statement.

Remove more spurious debugging.
2013-12-26 09:48:01 -07:00
Mathieu Le Marec - Pasquet
99a2791917 Better trace for nested jinja errors 2013-12-25 18:00:15 +00:00
Mike Place
e4caf0a470 Auth system unit testing framework.
* Setup testing classes and imports
* Test load_name()
2013-12-23 22:13:02 -07:00
Mike Place
72b565af2c Optimize imports. 2013-12-23 20:55:43 -07:00
Mike Place
f8b772f970 More aggressive IPC fix. 2013-12-23 19:36:57 -07:00
Mike Place
8efa385291 More unit tests. Many, many more. 2013-12-23 17:16:05 -07:00
Mike Place
ae4fdc1066 Raise IPC check even higher to resolve failing tests in Jenkins. 2013-12-23 17:11:24 -07:00
Mike Place
d15bd31b9c Unit testing and utils refinements
* More unit tests against utils module
* Minor modifications to utils module for formatting.
* Remove case which could not be reached inside utils module.
2013-12-23 17:10:29 -07:00
Mike Place
83b08df07d Clarify len of line. 2013-12-23 17:06:22 -07:00
Thomas S Hatch
fb0ca047d1 Fix lint errors in tests 2013-12-23 09:25:16 -07:00
Mike Place
fab5535240 test is_true 2013-12-22 19:23:45 -07:00
Mike Place
647f954c7c More detailed testing against the state verifier utility. 2013-12-22 19:15:59 -07:00
Mike Place
451cd8d7ea Default var and typo. 2013-12-22 16:40:09 -07:00
Mike Place
0ef7c56e11 Doh. Typo. 2013-12-22 16:37:07 -07:00
Mike Place
dc5874fb1c Don't run event tests on systems that can't support them. 2013-12-22 16:33:07 -07:00
Mathieu Le Marec - Pasquet
1365688bf7 Again, more robustness for zcbuildout tests 2013-12-22 18:52:54 +00:00
Thomas S Hatch
11ee832086 Line fixes 2013-12-20 17:23:35 -07:00
Mike Place
06810a1597 Update unit test to match PG fix. 2013-12-20 17:24:56 -07:00
Thomas S Hatch
706665ff0d Merge pull request #9382 from cachedout/docker-unit-tests
Unit testing
2013-12-20 16:17:58 -08:00
Mike Place
b77fce5816 Many more unit tests for salt.utils
Small doc change.
2013-12-20 17:12:49 -07:00
Thomas S Hatch
99cc12ddc5 This test is passing in standalone environments but not in Jenkins
I am stubbing it out and we will need to come back to it
2013-12-20 13:56:26 -07:00
Thomas S Hatch
b63c0449ac Stub out bad test 2013-12-20 13:55:37 -07:00
Mike Place
05b78e30bc More utils testing. 2013-12-20 13:47:01 -07:00
Mike Place
4176354820 Pylint fixes for regex errors. 2013-12-20 09:42:15 -07:00
Mike Place
40ecf088f2 Work on salt.utils unit testing. 2013-12-20 08:34:33 -07:00
Mike Place
3bb714282e Starting on unit tests for docker and salt.utils. 2013-12-19 09:14:59 -07:00
Pedro Algarvio
8034d126e2 Merge pull request #9335 from cachedout/ps-unit-tests
Correct failure when psutil is not installed. Also some minor reformatting.
2013-12-18 08:36:38 -08:00
Mike Place
bd2ec30682 Correct failure when psutil is not installed.
Reformatting.
2013-12-18 09:25:04 -07:00
Pedro Algarvio
c1107f22fe Merge pull request #9330 from cachedout/ps-unit-tests
Unit testing cron exec module.
2013-12-17 16:25:51 -08:00
Mike Place
d8facc96a4 Unit testing cron exec module. 2013-12-17 15:59:57 -07:00
Colton Myers
5b4d47fb10 Merge pull request #9320 from cachedout/ps-unit-tests
More ps exec module unit tests.
2013-12-17 14:11:29 -08:00
Mike Place
d7b7ad3b9f More ps exec module unit tests. 2013-12-17 11:23:49 -07:00
Mathieu Le Marec - Pasquet
bb7f5247d3 according buildout tests 2013-12-17 04:36:36 +01:00
Mike Place
20ab5b2d23 Lint. 2013-12-16 17:09:49 -07:00
Mike Place
26aa30393e Unit testing of ps exec module.
Seemed like this would be sort of mundane but there are actually a few dragons here.
Unit testing turned up the fact that we make use of methods in psutil that are deprecated!
2013-12-16 17:05:53 -07:00