Commit Graph

1158 Commits

Author SHA1 Message Date
Seth House
d00cd104ac And yet more pylint fixes 2014-06-19 17:25:56 -06:00
rallytime
3a84dd4a3c Unit tests for cloud_config function in salt.config.py 2014-06-19 16:03:59 -06:00
Thomas S Hatch
a46e6f4875 Merge pull request #13383 from s0undt3ch/issues/10404-vt-ptys-not-released
[DO NOT MERGE] Fix #10404 vt ptys not released
2014-06-19 14:16:52 -06:00
Pedro Algarvio
f518e1f186 Merge pull request #13564 from rallytime/migrate_cloud_config_tests
Migrate cloud config tests
2014-06-19 19:10:17 +01:00
rallytime
8f74282a34 Removed cloud_config_test.py file 2014-06-19 09:24:47 -06:00
rallytime
e53ec01cd4 Transfer cloud_config_test.py tests to config_test.py 2014-06-19 09:20:38 -06:00
Pedro Algarvio
34fcf1da45 Test if we're closing open PTY's 2014-06-19 13:08:50 +01:00
Pedro Algarvio
7590586d05 Don't fail on missing CherryPy 2014-06-19 13:00:38 +01:00
Seth House
53bab586f4 Merged salt-api into Salt
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
2014-06-18 22:13:56 -06:00
Seth House
1d4057fadf Updated all saltapi import paths to salt.netapi 2014-06-18 20:56:16 -06:00
rallytime
636cf892ca Pylint fix 2014-06-18 17:47:05 -06:00
rallytime
c7e3816e54 Unit tests for cloud provider extends functionality 2014-06-18 17:15:15 -06:00
rallytime
914c9ed1fb First rudimentary cloud provider config tests 2014-06-17 15:12:23 -06:00
Pedro Algarvio
9f7ead2e33 Remove unused imports 2014-06-15 13:05:18 +01:00
Pedro Algarvio
c2ab05bc56 Tempdir under integration.SYS_TMP_DIR and use AdaptedConfigurationTestCaseMixIn 2014-06-15 13:05:18 +01:00
Pedro Algarvio
000655d7f4 Use SaltClientTestCaseMixIn instead 2014-06-15 13:05:18 +01:00
Pedro Algarvio
4cbd6c6238 Remove unused imports 2014-06-15 13:05:17 +01:00
Pedro Algarvio
318409a859 Don't remove the root_dir, the tests suite takes care of that 2014-06-15 13:05:17 +01:00
Thomas S Hatch
60ac9b8321 Merge pull request #13433 from ahammond/psql_nopassword
psql should never prompt for a password
2014-06-14 07:24:14 -06:00
Thomas S Hatch
396078d1aa Merge pull request #13446 from anylain/add_traverse_dict_and_list
Add salt.utils.traverse_dict_and_list()
2014-06-14 07:23:15 -06:00
panying
742607a33f + add test_traverse_dict_and_list 2014-06-14 15:25:02 +08:00
Andrew Hammond
1c6b95b4dc psql should never prompt for a password
No matter if we have been given a password or not, it never makes sense
for psql to interactively prompt for a password. It's better to fail
immediately than to hang because psql is waiting for input that will
never happen.
2014-06-13 17:40:11 -07:00
Mathieu Le Marec - Pasquet
a6262beeb3 Fix the broken check state logic 2014-06-13 13:20:14 +02:00
Erik Johnson
0104ccc400 Fix failing jinja unit tests
These began failing due to a recent change in the error reporting for
undefined jinja variables.
2014-06-12 14:33:53 -05:00
Pedro Algarvio
0564fc363e A more generic directory name 2014-06-10 03:25:14 +01:00
Pedro Algarvio
9bd6d330ec Change to an existing directory before importing keyring 2014-06-10 01:52:53 +01:00
Pedro Algarvio
9d208eaf76 Use an explicit path for the keydir not getcwd 2014-06-10 01:52:53 +01:00
Pedro Algarvio
a7b7f18e6f Double to single quotes 2014-06-06 12:24:10 +01:00
Pedro Algarvio
c4e47df943 Don't use the hardcoded path 2014-06-05 10:10:55 +01:00
Pedro Algarvio
bebddb9174 Don't use hardcoded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
36ea569d0d Don't use hard coded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
7e11871d9f Ensure correct syspath 2014-06-01 06:55:52 +01:00
Thomas S Hatch
ba4cc71a14 fix more sls to yamlex refs 2014-05-30 10:14:47 -06:00
Thomas S Hatch
8b3dabbf7d lint 2014-05-30 09:45:46 -06:00
Thomas S Hatch
b8897a5b0d rename the sls renderer to the yamlex renderer 2014-05-30 09:28:20 -06:00
Thomas S Hatch
185eae31cd Merge branch 'serializers-migration' of https://github.com/johnnoone/salt into johnnoone-serializers-migration
Conflicts:
	salt/pillar/__init__.py
2014-05-30 09:16:21 -06:00
Thomas S Hatch
84f4fa1430 Merge pull request #13122 from cachedout/test_fixing
Fix broken tests
2014-05-30 09:08:53 -06:00
Pedro Algarvio
204ed95c2c PyLint ignore W1111 (assignment-from-none) 2014-05-30 09:38:35 +01:00
Mike Place
11e6ddf33c Fix SMTP test
Magic or ugly hack? You decide.
2014-05-29 16:38:59 -06:00
Mike Place
623b01af81 Pylint 2014-05-29 16:13:42 -06:00
Mike Place
0e53190996 Fix broken tests
Thanks to @rallytime for pointing out that several unit tests
were not working correctly when run locally.

I have fixed the perm_test to no longer use relative paths. I have
also disabled this tests since, at some point at least, perms changed
to be 0664 instead of 0644 in a number of places. This warrents further
discussion.

I have fixed pydsl_test to no longer throw errors to stdout about
missing SLS files. (Yay!!)

I have fixed the smtp_return tests so that it will without errors
on hosts with gnupg installed.
2014-05-29 15:04:11 -06:00
Michaël Lemaire
7b437abd4f Fixed MagicMock import in postgres_test 2014-05-28 15:14:22 +02:00
Michaël Lemaire
cd0f4adae8 Fixed postgres_group.present always updating on test=True 2014-05-28 15:11:24 +02:00
Michaël Lemaire
07bedfe362 Fixed state postgres_user always updating on test=True 2014-05-28 15:05:50 +02:00
Michaël Lemaire
a4b3ef9a69 Added unit tests for postgres_user.present 2014-05-28 14:58:53 +02:00
Michaël Lemaire
5126f0a8ac states.postgres_extension: Fixed unit test patching (and renamed to PostgresExtensionTestCase for future tests) 2014-05-28 14:58:09 +02:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00
David Czarnecki
b8df9af0ff Fix rvm module test for adding cwd argument 2014-05-23 16:38:04 -04:00
Erik Johnson
5e0d10f03c Update event tests to use truncated hash 2014-05-23 08:57:01 -05:00
Erik Johnson
0d35a56772 Ensure this test is run as root 2014-05-22 12:02:44 -05:00
Erik Johnson
4de5050ded Add test for sock path length 2014-05-22 11:59:26 -05:00
Joseph Hall
a0fae7c349 Cleanup whitespace issues for pylint 2014-05-21 19:31:46 -06:00
David Boucha
9dc182a2f4 fix codeauthor misspellings 2014-05-21 18:59:02 -06:00
Erik Johnson
512adb3136 Add test for shadow.gen_password
This addresses some breakage in this function. For more info, see
https://github.com/saltstack/salt/pull/12941.
2014-05-21 18:37:07 -05:00
Mike Place
888662692f Pylint zcbuildout
I see no evidence of this argument in use. Removed and modified test.

Closes #9556
2014-05-21 10:11:25 -06:00
Pedro Algarvio
5a8575dbb9 The helper method is now released 2014-05-20 10:53:47 +01:00
rallytime
46f90298fb Pylint fixes 2014-05-15 20:05:08 -06:00
rallytime
c9623c7cc2 Unit tests for aliases module 2014-05-15 16:51:44 -06:00
Gareth J. Greenaway
823575c901 Unit tests for file state broke after adding the follow_symlnks argument. Tests were looking for a value in a specific position in a dictionary which has been pushed back one value. Also fixing an issue that happened if the file being managed by the module is a symlink, file would be treated as a new file. 2014-05-14 11:30:28 -07:00
Thomas S Hatch
2ad2739d98 Merge pull request #12680 from tedski/mdadm_refactor
Refactor mdadm module/state to support all options on create.
2014-05-12 16:38:56 -06:00
rallytime
0042169b7c Created renderers directory in salt/tests/unit for gpg_test.py 2014-05-12 13:21:26 -06:00
Ted Strzalkowski
71983ab581 another pylint fix 2014-05-11 19:06:09 -07:00
Ted Strzalkowski
2f417e1250 pylint fix 2014-05-11 18:57:43 -07:00
Ted Strzalkowski
35a1955ea8 Added unit tests for refactored mdadm module.
- test that mdadm.create returns the proper cmd.run inputs
- test that test_mode=True does not call cmd.run
2014-05-11 18:46:22 -07:00
Thomas S Hatch
039e0841c1 Merge pull request #12548 from cachedout/12111
Eauth improvements and fixes
2014-05-09 13:55:42 -06:00
rallytime
aa45f50f04 Remove unused imports 2014-05-08 21:15:31 -06:00
rallytime
824969eab9 Correctly skip unit tests if gnupg is not installed 2014-05-08 21:10:15 -06:00
rallytime
cf4d2372b8 Modified GPG tests 2014-05-08 16:44:56 -06:00
Nicole Thomas
a77b55f054 Merge pull request #12527 from baconz/develop
Add unit tests and function doc strings to gpg renderer
2014-05-08 16:41:45 -06:00
Mike Place
33626659c7 Rewrite opts and pylint 2014-05-08 16:19:07 -06:00
Mike Place
f338bfd20e Pylint 2014-05-07 16:58:34 -06:00
Mike Place
f570ab8fd5 More client acl testing. 2014-05-07 16:43:52 -06:00
Erik Johnson
5c07011d65 Remove unnecessary test module 2014-05-07 13:00:33 -05:00
Thayne Harbaugh
871ba0010f BUG: The MOCK_HOSTNAME is not sufficiently long.
Extend the MOCK_HOSTNAME for a better chance that it will be longer
than the actual hostname.
2014-05-06 16:00:40 -06:00
Thayne Harbaugh
09eb54798b The MOCK_HOSTNAME is not sufficiently long to guarantee that it is
longer than the hostname on the current host.  Make it crazy long.
2014-05-06 15:28:55 -06:00
Mike Place
fac2c9754b Hook the assertions into the event system. 2014-05-06 12:04:12 -06:00
Mike Place
469989092d Pylint and (hopefully) Jenkins test fix. 2014-05-06 10:21:53 -06:00
Mike Place
e6e0eec532 More pylint 2014-05-06 09:23:09 -06:00
Mike Place
bbebbc6dfd Introducing eauth unit testing.
Typo
2014-05-05 16:52:26 -06:00
s8weber
d4b7951da8 fix minion id generation 2014-05-04 19:23:03 -04:00
Seth Madison
7453d6ef35 Add some unit tests for gpg renderer 2014-05-04 15:57:32 -04:00
Chris Rebert
45981a56f9 lots of copyediting 2014-04-30 12:06:27 -07:00
Pedro Algarvio
e31ca389ae Provide a custom keyring just for tests.
Properly skip tests.
2014-04-27 13:26:59 +01:00
Pedro Algarvio
18d969a674 Adapt the test to the changes made in 3c284b1b6. 2014-04-27 12:35:07 +01:00
Marek Skrobacki
524113fc4f fix pylint warnings 2014-04-26 10:21:26 +01:00
Marek Skrobacki
10ce848828 remove hard-dependency on keyring 2014-04-25 18:11:24 +01:00
Marek Skrobacki
7fbb5fcb78 add tests for keyring utils 2014-04-25 17:22:48 +01:00
Pedro Algarvio
f07e614a31 Adapt the tests to the new deprecation output. 2014-04-24 11:32:46 +01:00
Pedro Algarvio
7a5604fddd Bump deprecations to Lithium 2014-04-24 10:15:31 +01:00
Pedro Algarvio
d5c90480fb Bump deprecations to Lithium 2014-04-24 10:15:01 +01:00
Thomas S Hatch
05721efb0b Merge pull request #12115 from cachedout/test_fix
Fix stacktrace
2014-04-18 11:28:38 -06:00
Mike Place
205a3ac9c4 Grrrr 2014-04-18 11:25:15 -06:00
Thomas S Hatch
b469b07a16 Merge pull request #12114 from cachedout/test_fix
Disable unreliable test.
2014-04-18 10:57:11 -06:00
Mike Place
cb018eced0 Disable unreliable test. 2014-04-18 10:52:09 -06:00
Mathieu Le Marec - Pasquet
de66244e65 cron: fix test 2014-04-18 14:50:50 +02:00
Mathieu Le Marec - Pasquet
5ec87461c7 cron: pylint fixes 2014-04-18 12:38:54 +02:00
Mathieu Le Marec - Pasquet
9fa45ca022 cron: fix #11935 2014-04-18 09:14:21 +02:00
Pedro Algarvio
500513375e Use salt's master clean_proc routine.
On Fedora 20, we hit an issue, at least, similar to #3618.
While debugging it, I've found that the runtests process keeps eating
memory.

Using `clean_proc` has at least, allowed the runtests to finish without
triggering #3618.
2014-04-18 07:52:40 +01:00
Pedro Algarvio
9cdc0d5966 The script can be executable. 2014-04-16 01:23:55 +01:00
Pedro Algarvio
afd63deacc Fix PEP8 E303: too many blank lines (3) 2014-04-15 09:52:12 +01:00
Pedro Algarvio
ac4c042a55 Fix E8251 unexpected spaces around keyword / parameter equals 2014-04-15 09:51:16 +01:00
Thomas S Hatch
fc09454d90 Merge pull request #11985 from toumorokoshi/specialCopy
Fixes #11966, clearer interface for files.copy
2014-04-14 14:27:00 -06:00
Thomas S Hatch
359d92f5d3 Merge pull request #11967 from borgstrom/pyobject_imports
Allow for "imports" within pyobjects files
2014-04-14 14:16:35 -06:00
Yusuke Tsutsumi
6a8fbda076 Fixes #11966, clearer interface for files.copy
* adds recurse flag (required when copying directories)
* adds (merge|remove)_existing, to choose whether to keep existing files, or delete the target directory entirely.
2014-04-14 15:34:36 -04:00
Yusuke Tsutsumi
f5b4ac2395 Adding introspection methods for yum and apt-get
* adding yumpkg:owner
* adding aptpkg:owner
* refactoring owner method to utils.pkg library
2014-04-14 14:05:43 -04:00
Evan Borgstrom
d54be1b2f2 Allow for "imports" within pyobjects files
This allows for pyobject state files to import objects from other state
files by specifying a salt:// URL in the import statement.
2014-04-14 11:26:16 -04:00
Xavier Barbosa
ce2cf98518 implements sls renderer 2014-04-09 06:45:10 +02:00
Pedro Algarvio
640de961ac A new argument was added to the call, adjust. 2014-04-08 15:38:22 +01:00
Pedro Algarvio
c07ef89f93 salt/templates/lxc/salt_tarball is an expectable executable. 2014-04-08 13:47:26 +01:00
Nicole Thomas
6eec78fe46 Allow numerical user/group id's without looking up their existence 2014-04-03 13:02:10 -06:00
Thomas S Hatch
b632bb68a1 Merge pull request #11732 from rallytime/bugfix
Allow file state to accept numerical ids
2014-04-02 15:46:24 -06:00
Nicole Thomas
3f51dde820 Error checking for if numerical group or user exists 2014-04-02 13:35:58 -06:00
Nicole Thomas
2edbc465f5 Allow file state to accept numerical ids 2014-04-02 11:54:42 -06:00
Thomas S Hatch
09769d6fa2 lint tests 2014-04-02 11:16:24 -06:00
Seth House
ea7eccd0ea "serialized" -> "unserialized"
This was backward.
2014-03-31 10:15:27 -06:00
Seth House
bb9ff7aa6a First stab at unit tests for the various rest_cherrypy tool functions 2014-03-31 09:59:55 -06:00
Pedro Algarvio
7c782f6752 Adapt test case because we default to dropping unrelated events.
The previous default was not dropping unrelated event, however, this
could cause memory leaks, so, the current default is dropping those
events.

We now test for both behaviours.
2014-03-31 03:31:23 +01:00
Pedro Algarvio
ea8db1e427 Allow standalone test execution 2014-03-31 03:05:05 +01:00
Pedro Algarvio
e66432f593 Allow standalone test execution 2014-03-31 03:04:05 +01:00
Pedro Algarvio
a2e4a5c682 Allow standalone test execution 2014-03-31 03:03:40 +01:00
Pedro Algarvio
60d77f6d32 Allow standalone test execution 2014-03-31 03:03:00 +01:00
Pedro Algarvio
d1de22be25 Allow standalone test execution 2014-03-31 03:00:24 +01:00
Pedro Algarvio
92d74ebfdd Allow standalone test execution 2014-03-31 02:59:34 +01:00
Pedro Algarvio
982d8117b9 Allow standalone test execution 2014-03-31 02:59:04 +01:00
Pedro Algarvio
94f05e62fa Allow standalone test execution 2014-03-31 02:58:15 +01:00
Pedro Algarvio
f319ae5384 Allow standalone test execution 2014-03-31 02:57:34 +01:00
Pedro Algarvio
4208441175 Allow standalone test execution 2014-03-31 02:57:04 +01:00
Pedro Algarvio
328f3408b7 Allow standalone test execution 2014-03-31 02:56:33 +01:00
Pedro Algarvio
c010c443c5 Allow standalone test execution 2014-03-31 02:55:51 +01:00
Pedro Algarvio
25b8a60452 Allow standalone test execution 2014-03-31 02:54:37 +01:00
Pedro Algarvio
03f66d6874 Allow standalone execution 2014-03-31 02:42:36 +01:00
Pedro Algarvio
f7bd723e3f Add missing comma. 2014-03-29 01:26:02 +00:00
Thomas S Hatch
95ade395d6 Merge pull request #11511 from rallytime/darwin_sysctl_test
More darwin_sysctl tests
2014-03-25 14:23:20 -06:00
rallytime
27985060e2 Integration tests started for darwin_sysctl module 2014-03-25 13:52:54 -06:00
rallytime
334021d4a6 Removed unused variable 2014-03-25 11:21:47 -06:00
rallytime
b17164cfe8 More darwin_sysctl tests 2014-03-25 11:18:04 -06:00
Joseph Hall
33bf0bcdda Merge pull request #11503 from rallytime/darwin_sysctl_test
Pylint fix
2014-03-25 08:37:27 -06:00
rallytime
f192e8c202 Pylint fix 2014-03-25 08:26:40 -06:00
Thomas S Hatch
ef9fc46828 Merge pull request #11447 from s0undt3ch/hotfix/minion-events
Fix minion event trigger
2014-03-24 15:43:45 -06:00
Mike Place
de71f0b598 Merge pull request #11487 from rallytime/darwin_sysctl_test
Some unit tests for darwin_sysctl module
2014-03-24 13:10:18 -06:00
rallytime
81d29874ac Empty bottom line - pylint! 2014-03-24 13:06:09 -06:00
rallytime
ce52e33979 pylint 2014-03-24 13:04:35 -06:00
rallytime
1da1f32040 more darwin_sysctl module unit tests 2014-03-24 12:59:12 -06:00
rallytime
cfd86eeb49 Started unit tests for darwin_sysctl module 2014-03-24 12:22:17 -06:00
Pedro Algarvio
6fa685b1d2 Add some more files to the exempt ones 2014-03-24 17:02:23 +00:00
Pedro Algarvio
ed12816806 Update tests to new event classes signatures. 2014-03-24 16:54:31 +00:00
Pedro Algarvio
2c27ec8a8e Improve permissions check testcase. 2014-03-23 18:20:42 +00:00
Pedro Algarvio
ca76e31ac9 Allow standalone execution 2014-03-23 16:58:40 +00:00
Pedro Algarvio
3f2f5f3f76 Reuse existing vars. Allow standalone execution. 2014-03-23 16:57:51 +00:00
Thomas S Hatch
4af873dcaf Merge pull request #11337 from techdragon/fix-hightstate-failure-retcode
Fix for broken salt cmd return codes - issue #7013
2014-03-22 00:31:19 -06:00
Thomas S Hatch
43de620730 Merge pull request #11413 from s0undt3ch/hotfix/immutable-lists-sum
Simpler immutable types
2014-03-21 11:40:09 -06:00
Thomas S Hatch
7b48481c89 Merge pull request #11396 from kev009/get_fqhostname
Replace socket.getfqdn with internal salt.utils.network.get_fqhostname
2014-03-21 10:54:56 -06:00
Pedro Algarvio
5fa42543e3 Fix reference and allow standalone test excution. 2014-03-21 12:51:42 +00:00
Pedro Algarvio
f38b18ce7d Fix reference. 2014-03-21 12:48:06 +00:00
Pedro Algarvio
1825dfe635 Also test slicing 2014-03-21 12:45:54 +00:00
Pedro Algarvio
49bdbefb66 No more proxied immutables. Add test for nested immutables. 2014-03-20 23:59:38 +00:00
Kevin Bowling
14c9d75a92 Replace socket.get_fqdn with internal salt.utils.network.get_fqhostname 2014-03-20 14:37:23 -07:00
techdragon
e2a04d2877 Fixes & Updates
- fixed pep8 issue
- added more logic to check_state_result logic to handle list results properly and return false.
- ordered the check_state_result unit tests more logically. All the data type tests are now before the content & logic handling checks
- discovered duplicate test in check_state_result unit tests and removed it, both tests were asserting using the same data {'host': []}
2014-03-20 15:08:34 +08:00
rallytime
f2cff53756 Check if gid exists before adding group and associated tests 2014-03-18 13:02:20 -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
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