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
9,791 Commits 24 Branches 182 Tags 341 MiB
9f8eff13be
Commit Graph

627 Commits

Author SHA1 Message Date
Pedro Algarvio
495e7244c8 Fix pip requirements file permissions in case of non root runas. 
* In `salt.modules.pip.install()` we first check if file is already cached(in case being called from `salt.states.virtualenv.managed()`), if it's not, then try to cache it.
* If requirements and `runas` is passed, since  `salt.fileclient`'s cache needs to be private, we create a temporary file with the contents of the requirements file, owned by the `runas` user, which then gets passed to the pip command.
* Always delete the user, even if test(`integration.states.virtualenv.VirtualenvTest.test_issue_1959_virtualenv_runas`) fails.
* Minor PEP-8.
 2012-11-21 09:08:22 +00:00
Thomas S Hatch
1e4103a8fd Merge pull request #2646 from dcolish/develop 
Add test to reproduce #2631
 2012-11-20 08:19:23 -08:00
Pedro Algarvio
eda67f0110 Show salt comment on assertTrue(ret['result']) failed calls. 
* Created a mix which tests for the required assertion(True/False) and in case of a failure, shows salt comment kwarg in the raised assertion error so we know what was the original(salt's) failure.
 2012-11-20 16:09:57 +00:00
Dan Colish
88ab2a6e74 Better to have a passing test even when there's an exception 2012-11-20 08:05:50 -08:00
Pedro Algarvio
f6abd10ed9 Support logging.StreamHandler under python 2.6 which does not have a stream kwarg. 2012-11-20 15:52:20 +00:00
Dan Colish
1110f2a1ac Add test to reproduce #2631 2012-11-20 07:41:38 -08:00
Pedro Algarvio
4fdd8f4b8b Make destructiveTest decorated tests work when passed with -n to runtests. 2012-11-20 12:22:23 +00:00
Thomas S Hatch
dfc90286a9 Merge pull request #2635 from s0undt3ch/features/use-py27-subprocess 
Features/use py27 subprocess
 2012-11-19 19:13:46 -08:00
Jack Kuan
190f4bd828 Fix a case when a single shorthand state is declared without arguments. 
Also, now automatically adds the name argument, if one is not provided,
for states declared under a dot-prefixed state id.
 2012-11-18 22:02:24 -05:00
Pedro Algarvio
09eb92ad8a Only import what's needed, cleans up code. 2012-11-19 01:21:06 +00:00
Pedro Algarvio
6a6f256472 Make it, actually work, on python 2.6 2012-11-19 01:13:29 +00:00
Pedro Algarvio
c6dcdbe6dc Hardcore approach to travis-ci failures under python 2.6. 
* We basically copied subprocess from python 2.7 and import that one instead of the python 2.6 subprocess to run the tests. Since we import it under a different name, there should be no issues with the remaining of salt's source importing the regular subprocess module.
 2012-11-18 23:49:37 +00:00
Pedro Algarvio
a6584f5180 Add python 2.7 subprocess module. 2012-11-18 23:24:55 +00:00
Pedro Algarvio
863bc7ef37 Add missing import. 2012-11-18 19:06:17 +00:00
Pedro Algarvio
c5fe83272f Even more open() to salt.utils.fopen(). 2012-11-18 18:57:10 +00:00
Pedro Algarvio
f67d24cf30 Minor cosmetic change. 2012-11-17 17:43:23 +00:00
Pedro Algarvio
526ed994b8 Test for deprecation message first and then use the new --out format. 2012-11-17 17:39:06 +00:00
Pedro Algarvio
5bf4549777 Use actual time, to reduce time.sleep() inaccuracy. 2012-11-17 17:37:53 +00:00
Pedro Algarvio
bed55506c3 Proper OrderedDict check. 2012-11-17 01:19:37 +00:00
Pedro Algarvio
89fd313766 Fix stateconf test failing in 2.6 because OrderedDict was not available. 2012-11-16 22:45:12 +00:00
Pedro Algarvio
52b0c1ba8e Adapt cherry-picked 2dd188fa18abff3193450472af2192206907b3ba to the new output shell switch. 2012-11-16 18:01:01 +00:00
Pedro Algarvio
ee32784bb4 Make the salt-cp shell test case work across multiple machines. 2012-11-16 18:00:51 +00:00
Thomas S Hatch
61c72dd2de Merge pull request #2576 from s0undt3ch/issues/2566 
Deprecate `--xxx-out` in favour of `--out/--output`
 2012-11-15 21:25:21 -08:00
Pedro Algarvio
c60e4dd645 Fix tests and "convert" text output to "txt" when choosing outputter. 2012-11-16 00:07:08 +00:00
John Debs
4a062f1e69 Logic and test fixes for version, ri, rdoc support in gem state 2012-11-15 18:05:06 -05:00
Thomas S Hatch
c3c61b835a Merge pull request #2555 from ryanschneider/cp.get_dir 
Add gzip and template to cp.get_dir, expose make_dirs on cp.get_file
 2012-11-14 18:22:09 -08:00
Ryan Schneider
2ccf589425 Refactor: make_dirs -> makedirs, gzip_compression -> gzip 2012-11-14 18:06:53 -08:00
Ryan Schneider
ad1a43012a Add gzip and template to cp.get_dir, expose make_dirs on cp.get_file 2012-11-14 16:48:26 -08:00
Pedro Algarvio
e390bd92f4 Fix raw outputter test. 2012-11-15 00:03:31 +00:00
Pedro Algarvio
97b4dffd85 Re-add required import. 2012-11-14 16:03:46 +00:00
Thomas S Hatch
326904e020 An easy fix on opening files 2012-11-13 20:55:40 -07:00
Thomas S Hatch
48fd305391 Merge pull request #2544 from kjkuan/develop 
sls_render_pipe merge clean ups
 2012-11-13 19:29:39 -08:00
Pedro Algarvio
7c666d21d0 Need at least two worker threads for integration.modules.publish to pass. 2012-11-13 19:10:17 +00:00
Jack Kuan
7f3ac3fe89 Add some docs on render pipe. 
Also, added a stateconf state so that its stateconf.set function
can be used by the stateconf renderer.
 2012-11-13 02:01:34 -05:00
Jack Kuan
a76331e0e1 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-11-13 00:58:04 -05:00
Thomas S Hatch
6fce0a2353 Minor fixes for stateconf tests and sting updates 2012-11-12 22:20:37 -07:00
Thomas S Hatch
5b1bd0409b Clean up some missing componets in console.py 2012-11-12 21:08:04 -07:00
Jack Kuan
804f0ca671 Merge branch 'develop' of github.com:kjkuan/salt into develop 2012-11-12 18:40:57 -05:00
Thomas S Hatch
042b2490c6 Clean up console.py 
SINGLE QUOTES
Bare exceptions are bad
vars being used without being assigned
 2012-11-12 16:36:25 -07:00
David Boucha
4a2ceb458e set worker threads to 1 for testing 
Travis CI is failing on python 2.6
Trying to lower total memory consumption so the tests
will pass
 2012-11-12 16:22:05 -07:00
Jack Kuan
db451d5ed3 Update jinja template unit tests and remove obsolete salt.utils.jinja.get_template(). 2012-11-12 17:08:14 -05:00
Thomas S Hatch
5d97b51ef2 Merge pull request #2528 from kjkuan/sls_render_pipe 
Sls render pipe
 2012-11-12 09:59:24 -08:00
Jack Kuan
7ad98acfb4 Fix stateconf unit test and the problem with sls_dir==''. 2012-11-12 00:50:46 -05:00
Jack Kuan
8cb70d0a6e Update stateconf renderer module doc and revert names declaration support. 2012-11-12 00:16:03 -05:00
Pedro Algarvio
152088d727 Include another option into the test_salt_documentation_arguments_not_assumed test. 2012-11-11 20:11:08 +00:00
Jack Kuan
0931455721 Merge branch 'develop', remote-tracking branch 'origin' into sls_render_pipe 2012-11-10 23:06:14 -05:00
Pedro Algarvio
d3e0d64068 Show a nice clock counter while we wait for the sync job to finish. 2012-11-09 15:25:16 +00:00
Pedro Algarvio
527cf4ee38 Don't assume again and expand test. 
* When introducing the "Don't assume!" changes I also assumed that there were always more than one argument from the shell. Expanded the testcase to include this check.
 2012-11-09 11:32:36 +00:00
Pedro Algarvio
75f70e49f3 Include a test case for the previous "Don't assume!" commit. 2012-11-09 11:23:30 +00:00
Thomas S Hatch
67f3395627 Merge pull request #2492 from ryanschneider/cp.get_file-gzip 
Add gzip_compression support to cp.get_file
 2012-11-08 17:49:41 -08:00
Ryan Schneider
c638617612 Add gzip_compression support to cp.get_file 2012-11-08 16:09:38 -08:00
Pedro Algarvio
b7c763dec1 Improve salt.utils.build_whitepace_splited_regex(). Fixes #2379. 
* Although we're building a regex which should ignore white space and new lines, the built regex should always match start and end of string.
 2012-11-08 19:33:51 +00:00
Jack Kuan
6c13f876b2 Merge branch 'develop', remote-tracking branch 'origin' into sls_render_pipe 2012-11-08 10:31:23 -05:00
Pedro Algarvio
b50e4cb9c5 Improve salt.utils.contains_regex(). Fixes #2401. 
* When `re.search`'ing, do a `re.MULTILINE` search. Not all matches happen on first line, specially using the `BufferedReader`.
* PEP-8 fixes.
* Removed `rowname` from `salt.utils.mysql_to_dict()` since it was not being used.
 2012-11-08 12:47:19 +00:00
Jack Kuan
f1c49d6efd Minor update to a test case. 2012-11-08 02:00:54 -05:00
Jack Kuan
f921e91377 Add unit tests for the stateconf renderer. 
Also fixed a few bugs in the stateconf renderer.
 2012-11-08 01:46:03 -05:00
Thomas S Hatch
ec901ce29c Merge pull request #2463 from s0undt3ch/issues/2462 
Fix #2462
 2012-11-07 08:12:49 -08:00
Pedro Algarvio
cae00911a5 One more try to properly handle the process termination. 2012-11-07 14:10:02 +00:00
Pedro Algarvio
b4f2ad2884 Never fail on process.terminate() since the process is supposed to have ended. 2012-11-07 13:58:44 +00:00
Pedro Algarvio
8e9fd09eeb Try to cleanup after ourselves. 
* Only instantiate a `LocalClient` on a test if one is required.
* Try to precipitate garbage collection on our minions connect and sync multi-processes.
 2012-11-07 13:40:39 +00:00
Ryan Schneider
721bce0a11 Fixed integration test 2012-11-06 19:36:51 -08:00
Ryan Schneider
49fb321254 Add integration test 2012-11-06 19:36:51 -08:00
Pedro Algarvio
c5c637154a Try to get some system information out of Travis-CI. 2012-11-06 18:11:26 +00:00
Pedro Algarvio
af7ebf12f8 Try not to fail on travis-ci under python 2.6 
* Raised max open files by 1024 since running in a vagrant machine 2048 was not enough, though, I think travis-ci defaults to a higher value.
* Wait a bit longer on the events testing.
* Separated the initial minions connected and minions synced into two different events and functions. Also corrected the `if` expected value when a timeout occurs.
 2012-11-06 16:02:36 +00:00
Pedro Algarvio
e04c872c66 Convert the remaining tests hard-coding temporary paths. 2012-11-06 12:44:53 +00:00
Pedro Algarvio
e2168602fb Allow passing multiple path elements to construct a path. 2012-11-06 12:15:24 +00:00
Pedro Algarvio
739eeac30d Create an "alias" for temfile.gettempdir() to reduce calls to it. 2012-11-06 12:14:02 +00:00
Pedro Algarvio
bb6cb62901 Switched runtests_helpers.get_temp_dir_for_path to runtests_helpers.get_salt_temp_dir_for_path. 2012-11-06 11:32:48 +00:00
Pedro Algarvio
75644992e2 Don't hard-code temporary paths on tests. Refs #2462. 2012-11-06 11:20:06 +00:00
Jack Kuan
f2d8c5cef3 Add yaml/json parsing to values of kwargs for state.single. 
Also fixed an incorrect use sls_encoder in compile_template_str().
 2012-11-06 01:26:08 -05:00
Pedro Algarvio
4d38754f38 Uncomment required line. 2012-11-04 12:22:46 +00:00
Pedro Algarvio
a1696c17d8 Finish fix of last commit. 2012-11-04 11:53:59 +00:00
Pedro Algarvio
33fa855bc4 We're apparently unable to have an empty last line in yaml literal strings. 2012-11-04 11:46:00 +00:00
Pedro Algarvio
5af62d01ac Fix integration.modules.state.StateModuleTest.test_issue_1896_file_append_source and still maintaining an empty line check. 2012-11-04 11:35:23 +00:00
Pedro Algarvio
3de32be0c9 Fix integration.shell.call.CallTest.test_default_output(). 2012-11-04 10:29:07 +00:00
Pedro Algarvio
0cad15e299 Fix integration.runners.jobs tests. 2012-11-04 10:22:18 +00:00
Pedro Algarvio
2053c03843 Fix key shell tests to match outputter changes. 2012-11-04 10:08:30 +00:00
Pedro Algarvio
6448dd87da Some fixes on the git state tests. 
* Always remove the repository directory.
* When testing recursive with git 1.7.9.5, we cannot test for a directory because it's a plain file with the contents:
  gitdir: /tmp/salt-tests-tmpdir/salt_repo/.git/modules/vendor/modules/js/receiptverifier
 2012-11-04 09:58:05 +00:00
Jeff Schroeder
2bc78460db Automated cleanup converting str.split('\n') --> str.splitlines() 
Performed with this command from the top-level source tree:
	find -name '*.py' -type f | xargs sed -r -i "s/\.split\('\\\n'\)/.splitlines()/g"
 2012-11-03 21:25:11 -07:00
ffa
a12d859642 bug fixes for conformity because cult code is good code 
* don't overwrite or delete when the force option is not true

  * when the user `runas` doesn't have permission to create a directory in the
    parent directory of `target` or `name`, the directory may be created in
    preparation of git. So, don't remove the empty directory before cloning.

  * the force option still removes the directory even if it is empty

* ensure submodules are initiated recursively everywhere for consistency

* catch all module calls for consistency

* tests to test
 2012-11-03 00:30:31 -07:00
ffa
019afc0e80 misc bug fixes 2012-10-31 23:13:25 -07:00
ffa
7625ebe429 add integration test to test failure 2012-10-31 22:56:59 -07:00
ffa
79cacbad1e bug fix and integration tests for git 2012-10-31 22:33:07 -07:00
Thomas S Hatch
7db30d090a Fix outputter bug introduced with changes to yaml 2012-10-30 14:41:47 -06:00
Thomas S Hatch
c8e79c9ac3 fix outputter test with changes to yaml outputter 2012-10-30 14:15:23 -06:00
Pedro Algarvio
19d07bbba5 Fix tests in integration.shell.call. 2012-10-30 17:16:06 +00:00
Pedro Algarvio
cfae86b744 Fix salt-key tests to comply with the new salt.key changes. 2012-10-30 17:09:50 +00:00
Thomas S Hatch
d8451b9a37 Make wheeltest pprint, much easier to use 2012-10-29 23:04:15 -06:00
Thomas S Hatch
4522d1fb37 W00t, the wheeltest script works 2012-10-29 22:55:22 -06:00
Thomas S Hatch
0ccb4d9b9b more work on the wheeltest script 2012-10-29 22:22:19 -06:00
Thomas S Hatch
07ad044ab9 Add initial not working next 2012-10-29 18:06:47 -06:00
Thomas S Hatch
1fa5129b90 Fix tests wrt output updates 2012-10-24 22:55:18 -06:00
Antti Andreimann
7085edf590 Use file.managed as a backend of file.recurse. Fixes #1583 
Rewrite file.recurse state module to leverage existing file.managed and file.directory
modules to do the heavy lifting. This removes code duplication and will make
templates available for file.recurse.

These improvements will be visible to the end-user:
- All files in directory can now be templatized
- destination directory is no longer created in test mode
- When clean mode is enabled, the module is capable of replacing
  existing files with directories and vice versa
 2012-10-24 17:15:29 -07:00
Thomas S Hatch
9f05f53fd7 Fix tests from failing if token present for the user 2012-10-22 14:43:47 -06:00
Thomas S Hatch
4c8a4b2191 Fix RabbitMQ tests where we can be a little less specific 2012-10-19 15:20:31 -06:00
Scott Walton
e7ea808701 Merge remote-tracking branch 'upstream/develop' into develop 2012-10-19 16:28:55 +01:00
Scott Walton
3b23817559 Fixed tests for supervisor and rabbitmq #962 2012-10-19 16:28:38 +01:00
Scott Walton
9a0fe34e9a Some clean-up, and tests for #962 2012-10-19 16:07:31 +01:00
Scott Walton
0bd81e5ae6 Added support for managing virtual hosts #962 2012-10-19 15:05:35 +01:00
Scott Walton
b7ed775a07 Grammar 2012-10-19 11:42:32 +01:00
Scott Walton
340616a379 Added test framework for rabbitmq user #962 2012-10-19 11:42:01 +01:00
Thomas S Hatch
8c3fadf15e Fix python 2.6 compat issue in tests 2012-10-18 22:37:02 -06:00
Daniel Miller
1957700161 Add "file.patch" state function 2012-10-18 12:23:47 -04:00
Daniel Miller
3a68a85a9b Add "file.patch" module function 2012-10-18 12:20:39 -04:00
Thomas S Hatch
c1fc9d6726 fix sock_dir change for eventlisten script 2012-10-15 22:50:31 -06:00
Seth House
2e9ecdbaa4 Remove bash-ism from pip state test 
This one is pretty silly; hopefully the regex match is still specific
enough to be a good test.

% bash -c '/tmp/someenv/bin/pip install something'
bash: /tmp/someenv/bin/pip: No such file or directory

% zsh -c '/tmp/someenv/bin/pip install something'
zsh:1: no such file or directory: /tmp/someenv/bin/pip
 2012-10-15 15:31:47 -06:00
Pedro Algarvio
6533c48014 Just some renames. Refs #2227. 2012-10-12 11:53:40 +01:00
Pedro Algarvio
ae7e476bfc Handle some quoting issues while building the whitespace regex for file.append. Fixes #2227. 2012-10-12 11:45:27 +01:00
Pedro Algarvio
d6d8e22b68 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-10-12 10:57:37 +01:00
Seth House
6c103bc4df Changed lookup_jid runner to return empty dict instead of an exception 2012-10-09 13:55:54 -06:00
Seth House
8c18c29323 Fixed bungled default logic for minionswarm root_dir 2012-10-09 12:20:46 -06:00
Seth House
17627fea89 Added flag to set the root_dir for a minionswarm 2012-10-08 14:16:53 -06:00
Thomas S Hatch
a556a44707 fix jobs runner test for new exception return 2012-10-07 10:20:03 -06:00
Thomas S Hatch
bd041c31f6 sp 2012-10-06 23:39:25 -06:00
Thomas S Hatch
af03feecee Update jobs runner to check for valid exception type 2012-10-06 23:30:11 -06:00
Thomas S Hatch
fa2c84317d update to new bad jid return data 2012-10-06 23:01:34 -06:00
Thomas S Hatch
7a5cead786 this is 5 now... 2012-10-06 22:59:42 -06:00
Thomas S Hatch
5aa1e847b6 update tests for changes in directory perms 2012-10-06 22:53:04 -06:00
Pedro Algarvio
cec1cbd477 Fix test if there the host has multiple subnets. 2012-10-07 03:05:00 +01:00
Pedro Algarvio
7e816c291f Add shell ipcadr match test. 2012-10-06 01:29:24 +01:00
Thomas S Hatch
3d9375038c Merge pull request #2183 from s0undt3ch/issues/2167 
Fix #2167. Testcases included.
 2012-10-05 17:21:24 -07:00
Pedro Algarvio
b0bf4919a3 Add exsel shell match test. 
Although this commit does not exactly reference the problem see on #2167, it was added while working for that issue.
 2012-10-06 01:11:03 +01:00
Pedro Algarvio
174ee8aab8 Fix #2167. Testcases included. 2012-10-06 01:05:04 +01:00
Pedro Algarvio
496906e413 Add exsel shell match test. 
Although this commit does not exactly reference the problem see on #2167, it was added while working for that issue.
 2012-10-05 07:56:23 +01:00
Pedro Algarvio
eb22aa5f49 Allow some more time to get the tests events notifications. 2012-10-05 07:15:00 +01:00
Pedro Algarvio
ac1fe9810a Point hosts.file and aliases.file to the new tests temporary dir. 2012-10-05 07:10:53 +01:00
Pedro Algarvio
85c6664538 Fix running tests using python setup.py tests. I was deleting it too soon and not re-creating it. Increase tests verbosity on travis-ci. 2012-10-05 02:45:35 +01:00
Pedro Algarvio
b6cb78364f Switch integration tmp to the system's temporary directory. 
While running the tests within a VirtualBox(vagrant) machine, if the salt source is mounted using shared folders, any tests involving hard links WILL fail. Any tests involving symlinks, can be made to work by setting some properties on the VirtualBox shared folder. By moving the tests `tmp` directory to `tempfile.gettempdir()` we avoid this false test case errors.
 2012-10-05 00:52:00 +01:00
Thomas S Hatch
858d086995 Args got flipped in eventlisten 2012-10-02 13:26:23 -06:00
Pedro Algarvio
4c456864db Improve our tests runner. 
* Show an error when the user tries to use `--xml` and `xmlrunner` is not installed.
* Add support to generate HTML reports of the tests coverage.
 2012-10-02 13:04:22 +01:00
Pedro Algarvio
624fb03d9c Smaller requirements.txt also works for testing. 2012-10-01 10:21:40 +01:00
Pedro Algarvio
e87a408dcd Correct license. 2012-10-01 10:16:21 +01:00
Pedro Algarvio
8d1411115d Merge branch 'develop' of github.com:saltstack/salt into issues/1959 2012-09-30 19:21:41 +01:00
Pedro Algarvio
0872852602 Add missing imports. 2012-09-30 18:41:44 +01:00
Pedro Algarvio
27bf64fbf3 Only root can run these tests. 2012-09-30 18:26:39 +01:00
Pedro Algarvio
73a679e070 Include primary group into user.info groups. Fixes #2137. 2012-09-30 18:01:47 +01:00
Pedro Algarvio
064b3a60c2 Add test case for #1959. 2012-09-30 12:20:38 +01:00
Pedro Algarvio
325902c169 Test to make sure we're outputting kwargs on the user.delete documentation. 2012-09-30 10:59:07 +01:00
Pedro Algarvio
905fb835cd Improve runtests.py logging and report output. 
* All logging messages are now logged on a log file. If verbose is enabled, the log messages are also logged to the console.
 * The tests report now also let's us know if there were no glitches.
 2012-09-30 10:40:06 +01:00
Pedro Algarvio
420bfe830b Mark destructive tests with the destructiveTest decorator. 2012-09-29 23:16:08 +01:00
Thomas S Hatch
47221a4f98 Merge pull request #2135 from s0undt3ch/features/overall-tests-resume 
Provide an overall tests report.
 2012-09-29 13:52:21 -07:00
Pedro Algarvio
e8766b7b8d Allow certain tests to marked as destructive. 
* Some tests might be considered destructive, such as adding or removing users from the system. This change allows those tests to be skipped unless stated otherwise.

```python

from saltunittest import destructiveTest

class ATestCase(TestCase):

    @destructiveTest
    def test_some_destructive_code(self):
        """Some destructive code."""

```

On the console we get something like:
```
test_destructive (unit.config_test.ConfigTestCase) ... skipped 'Destructive tests are disabled'
```
 2012-09-29 15:42:43 +01:00
Pedro Algarvio
ced9e7d91e Remove the tests added to explicitly fail. 2012-09-29 12:51:39 +01:00
Pedro Algarvio
6896fd0ab8 Allow disabling the tests report. 2012-09-29 12:48:50 +01:00
Pedro Algarvio
b8917071f6 Provide an overall tests report. 
Previously we have to go through the scroll history to see which tests failed, which were skipped, etc. Now, besides test failures, errors and skips being reported like they always were, we also provide a nice overall report and the end.
 2012-09-29 12:10:06 +01:00
Thomas S Hatch
f1dca86fd4 Fix some quotes 2012-09-28 17:40:30 -06:00
Thomas S Hatch
59e775ed8d remove unused skipif 2012-09-28 17:35:59 -06:00
Pedro Algarvio
7f7b196f1e Include an invalid items test for state.template* functions. Refs #2068. 2012-09-28 17:56:13 +01:00
Pedro Algarvio
b28a80fab0 Minor whitespace formatting 'prettyfication'. 2012-09-28 17:44:35 +01:00
Pedro Algarvio
2211afa63a Properly render the high state loaded from templates. Fixes #2068. 
Previously using `state.template` or `state.template_str` would not be checked/rendered into proper formatting resulting in some templates not being correctly executed. For example, the following template worked:
```
/tmp/issue-2068-template-str:
  virtualenv:
    - managed
    - no_site_packages: True
    - distribute: True

pep8-pip:
  pip:
    - installed
    - name: pep8
    - bin_env: /tmp/issue-2068-template-str
    - mirrors: http://testpypi.python.org/pypi
    - require:
      - virtualenv: /tmp/issue-2068-template-str
```
as opposed to the following which did not work:
```
/tmp/issue-2068-template-str:
  virtualenv.managed:
    - no_site_packages: True
    - distribute: True

pep8-pip:
  pip.installed:
    - name: pep8
    - bin_env: /tmp/issue-2068-template-str
    - mirrors: http://testpypi.python.org/pypi
    - require:
      - virtualenv: /tmp/issue-2068-template-str
```
The dotted names should be converted into lists for example, which was the problems with the two examples above.
 2012-09-28 17:34:55 +01:00