Commit Graph

211 Commits

Author SHA1 Message Date
Chris Rebert
802a631dd9 more typo/misspelling fixes 2014-11-05 15:29:25 -08:00
Thayne Harbaugh
dc4892442a Add yaml_dquote() and yaml_squote() utilites; load them as Jinja filters.
When templating state files the variable contents may contain
characters that YAML will interpret specially.  Rather than try to
escape the special characters so that they are safe use a filter that
protects special characters in YAML values.
2014-11-03 16:14:54 -07:00
Thomas S Hatch
3f58d716a2 Merge pull request #16878 from plastikos/improvement-filter_by
Improve filter_by() base argument:
2014-10-30 10:02:32 -06:00
Mike Place
39d6d8e75f remove splitted test 2014-10-27 18:23:20 -06:00
Thayne Harbaugh
7bd7e4c2b7 Appease the pylint gods; back-out unrelated changes. 2014-10-24 11:32:12 -06:00
Thayne Harbaugh
65e477dd67 Improve filter_by() base argument:
* Change filter_by() base argument to a key in lookup_dict rather
    than a dictionary.  This allows more compact usage and more
    readable use of base values/defaults in the lookup_dict.

  * Change/improve function-local documentation for lookup_dict().

  * Add specific use-case of "base" argument for lookup_dict() in the
    formulas documentation.

  * Expand filter_by() unit testing to validate use of base argument.

  * Add unit test for salt.utils.dictupdate.update() to provide
    complete depth-of-testing of filter_by() which uses
    dictupdate.update().
2014-10-24 11:13:47 -06:00
rallytime
df827ab13c Merge branch '2014.7' into develop
Conflicts:
	salt/utils/minions.py
2014-10-21 16:07:33 -06:00
rallytime
ed37dde094 Pylint fix 2014-10-20 21:21:01 -06:00
rallytime
3020b2084b Test long jid passed on CLI 2014-10-20 16:53:56 -06:00
Thomas S Hatch
1468c26ec1 Merge branch '2014.7' into develop
Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
2014-10-13 15:03:33 -06:00
Pedro Algarvio
e683619f9f Having data left to read does not mean the process is alive 2014-10-13 17:19:42 +01:00
Pedro Algarvio
4470c0dc68 White-space lint fix 2014-10-12 04:29:59 +01:00
Pedro Algarvio
51479e4592 Include a test case in order to check for full output from VT 2014-10-12 03:37:08 +01:00
Pedro Algarvio
743c26e562 Instead of checking for a live process, check for unread data.
Add a unit test which tests proper behaviour.

Fixes #15941
2014-10-12 02:28:35 +01:00
Colton Myers
3e741d7a98 Merge branch '2014.7' into develop 2014-09-25 16:37:35 -06:00
rallytime
b891ef12f0 Skip test_vt_size unit test 2014-09-25 15:38:01 -06:00
Colton Myers
8d0bf0ee95 Merge branch '2014.7' into develop
Conflicts:
	salt/states/pip_state.py
2014-09-15 11:49:04 -06:00
rallytime
e34157c70b Add skipIf import to fix the 2014.7 tests 2014-09-15 08:23:08 -06:00
Pedro Algarvio
a171a35c89 Disable test_issue_10404_ptys_not_released
Disabled until we can find out why this kills the tests suite with an exit code of 134
2014-09-14 23:54:38 +01:00
Thomas S Hatch
245c06100d Merge pull request #15568 from jacksontj/process_manage
Process manager
2014-09-09 11:30:30 -06:00
Thomas Jackson
4a83d8a9c3 Pylint cleanup 2014-09-06 15:45:15 -07:00
Thomas Jackson
d029685e96 Change main master daemon to use ProcessManager
Add tests for processmanager
2014-09-06 14:31:20 -07:00
Antoine Jacoutot
1ef276575f tests: recognize OpenBSD 2014-09-04 10:23:59 +02:00
Thomas S Hatch
b0561a703b Revert "Pull out pending_events changes and reuse"
This reverts commit e832a3a17f.
2014-08-08 12:49:46 -06:00
Pedro Algarvio
21141af46a Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Michael Birtwell
32acb7aeae Pull out pending_events changes and reuse
PendingEventsBase implements all the pending_events queue management
Make both normal SaltEvent and raetevent.SaltEvent inherit from this to
standardise the get_event interface.
Update tests for event.SaltEvent (Couldn't find tests for
raetevent.SaltEvent)
2014-07-31 12:23:38 -06:00
Thomas S Hatch
0577b4070b lint fix 2014-07-25 10:21:31 -06:00
Pedro Algarvio
ea01af39b4 Skip test on Darwin after making an effort 2014-07-24 13:12:46 +01:00
rallytime
9b9a60efea Skip vt_test in os x - still needs some work to run 2014-07-23 14:40:03 -06:00
Nicole Thomas
486dbe3476 Merge pull request #14389 from s0undt3ch/hotfix/osx-pyt-nr
Allow the VT tests to run on OSX
2014-07-23 14:38:58 -06:00
Pedro Algarvio
6c7e39dfcd Factor out into a function the current number of PTY's detection code 2014-07-23 19:43:18 +01:00
rallytime
51c7b95e6f Give rhel5 a chance to pass the cache tests 2014-07-22 15:38:54 -06:00
Pedro Algarvio
fa2149e1da Allow the VT tests to run on OSX 2014-07-22 15:20:03 +01:00
rallytime
7bb5ef3773 Skip lxc tests if no lxc and skip failing vt_test if running osx 2014-07-21 17:11:20 -06:00
Thomas S Hatch
6abccbc0cf fix this better, don't use clean_proc from master.py. 2014-07-15 15:06:15 -06:00
rallytime
7bea8f5cb6 Change python asserts to unittest asserts 2014-07-15 11:56:50 -06:00
rallytime
c5c841750a Raise ValueError instead of returning in utils.schedule.eval 2014-07-09 11:59:31 -06:00
rallytime
7942350a65 Fix where=None bug 2014-07-08 16:58:19 -06:00
rallytime
0a7b58652b Fix potential KeyError in schedule.delete and more unit tests 2014-07-08 15:54:30 -06:00
rallytime
a3c1d0e320 A few more tests for enabling and disabling jobs 2014-07-08 12:00:08 -06:00
rallytime
5ad8bb8f01 Update test docstrings 2014-07-08 11:38:16 -06:00
rallytime
cf11ca22d0 More scheduler unit tests and fixed keyerror possibility 2014-07-08 11:27:32 -06:00
rallytime
d5c2a92d24 Fix typo in email from bad copy-paste 2014-07-07 16:12:11 -06:00
rallytime
a7eadd74ff remove unnecessary comment 2014-07-03 15:49:59 -06:00
rallytime
656db75ac0 Started some schedule unit tests 2014-07-03 15:48:46 -06:00
Erik Johnson
d726c2f48a Add additonal unit tests for pull request #13713 2014-06-25 11:52:02 -05:00
Pedro Algarvio
34fcf1da45 Test if we're closing open PTY's 2014-06-19 13:08:50 +01: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
Mathieu Le Marec - Pasquet
a6262beeb3 Fix the broken check state logic 2014-06-13 13:20:14 +02:00