Thomas S Hatch
dd28185763
Merge pull request #3459 from archtaku/tests
...
Add tests for nested grain/pillar matching
2013-01-25 22:24:42 -08:00
Erik Johnson
77eeb47bea
Add tests for nested grain/pillar matching
...
Also added tests for traditional grain matching when target grain is a
list.
2013-01-26 00:13:51 -06:00
Thomas S Hatch
4c95f0e0ea
fix #3449
2013-01-25 21:16:11 -07:00
Jack Kuan
0976f42410
Fix test case skipping logic: if < py2.7 then no OrderedDict, so skip.
...
For ordered execution, PyDSL requires py2.7 or above. Although, it's
possible to make it work with a third-party OrderedDict implementation
like the yaml renderer does..., this is not bothered here.
2013-01-24 12:21:54 -05:00
Pedro Algarvio
eb38c4de5f
Fix supervisor test.
2013-01-23 23:23:05 +00:00
Pedro Algarvio
34522907e8
One more grain.item fix to comply with new dict output.
2013-01-23 23:00:19 +00:00
Pedro Algarvio
0207416f3c
Conform with the dict return type for 'salt.modules.grains.item'.
2013-01-23 22:51:45 +00:00
Jack Kuan
5ad5cd9b6e
Fix a bug in the pydsl test case.
2013-01-21 10:27:06 -05:00
Thomas S Hatch
99172816ea
Merge pull request #3329 from mjarco/fix-config-options-defaults
...
Default options were never returned if omit_pillar flag was set to false (or unset)
2013-01-20 20:17:39 -08:00
Jack Kuan
897f877bed
Added docs for pydsl and fixed a syntax inconsistency.
2013-01-20 01:21:05 -05:00
Pedro Algarvio
3629fe88c0
Fix tests.unit.pydsl_test and tests.unit.stateconf_test.
...
No more errors are shown because the configuration files are not readable, and in fact, the minion configuration can be use, unlike what was said in the comment.
2013-01-20 04:09:07 +00:00
Thomas S Hatch
86ed822148
Single quotes
2013-01-19 18:22:54 -07:00
Michał Jarco
77f898b0cb
Simplistic tests (still better than none)
2013-01-19 15:02:06 +01:00
Pedro Algarvio
09bba5b054
git describe sha signatures have a length of 8 chars.
2013-01-19 05:07:41 +00:00
Pedro Algarvio
7694829219
Also include the number of commits after the found tag.
2013-01-19 04:38:36 +00:00
Pedro Algarvio
d3391f4db0
Harden git describe parsing so it does not fail on awkward situations.
...
This issue came up because a user is using custom tags and git describe for him is something like `debian/0.11.1+ds-1-3-ga0afcb`.
Added unittests for this.
2013-01-19 02:31:00 +00:00
Thomas S Hatch
08471effee
Merge pull request #3320 from kjkuan/pydsl-updates
...
Pydsl updates
2013-01-18 11:27:16 -08:00
Jack Kuan
a678901c48
Fix test cases for py2.6.
2013-01-18 14:14:42 -05:00
Jack Kuan
9c35844c56
Make pydsl work with stateconf.
...
- Added implicit ordering to pydsl.(turned on via __pydsl__.set(ordered=True))
- Fixed a KeyError bug in stateconf renderer that happens during id renaming.
- The stateconf renderer now generates a no-op start state as the
"first" state in a sls file.(enabled via -s)
- Made the stateconf renderer take high state input via the new -p
option, so we can pipe pydsl output into it.
- Added more and fixed some test cases for stateconf and pydsl.
2013-01-18 12:34:56 -05:00
Thomas S Hatch
e354080dd7
don explicitly add node on eventlisten
2013-01-17 14:00:53 -07:00
Thomas S Hatch
bbad93c386
Add skipif to a test that requires root
2013-01-17 13:29:49 -07:00
Pedro Algarvio
dcb8477f7d
Fix phrasing.
2013-01-16 00:11:48 +00:00
Pedro Algarvio
d2f5461a09
Fix the test skip in case of a lower git describe parsed version info.
2013-01-16 00:02:20 +00:00
Pedro Algarvio
44b45ffa0c
Too much spaces(PEP-8).
2013-01-15 22:55:20 +00:00
Pedro Algarvio
b1488b61c5
Fix integration.shell.key output tests.
2013-01-15 21:53:29 +00:00
Thomas S Hatch
603be37e2b
Merge pull request #3280 from s0undt3ch/develop
...
Several deprecation fixes, enhancements, clarifications, for 0.12
2013-01-15 13:43:53 -08:00
Pedro Algarvio
b9afd32994
If the parsed version info is higher, then we're most likely about to release a new salt version.
2013-01-15 19:42:24 +00:00
Pedro Algarvio
4adaab4dce
Update tests to the new deprecation message.
2013-01-15 19:42:01 +00:00
Pedro Algarvio
b2e5cbb56c
Merge branch 'develop' of github.com:saltstack/salt into develop
2013-01-15 19:33:18 +00:00
Pedro Algarvio
392bb8ce1d
Remove the deprecation config tests. Lower the salt call's timeout to 30 secs. Refs #3271 .
2013-01-15 19:19:57 +00:00
Thomas S Hatch
a1de80e5c6
Merge pull request #3257 from mjarco/fix-local-jinja-template-resolution
...
Fix jinja template includes lookup with salt-call --local mode
2013-01-15 11:03:54 -08:00
Pedro Algarvio
9e804add7a
Simplify logic of getting the temporary directory.
2013-01-15 17:50:09 +00:00
Pedro Algarvio
d61ef51e7a
Show why git describe failed on the tests.
2013-01-15 14:16:39 +00:00
Thomas S Hatch
89525ad6d0
remove pre 0.12.0 test handles
2013-01-15 00:10:19 -07:00
Thomas S Hatch
4617a931be
Remove debugging pprint
2013-01-14 23:53:18 -07:00
Thomas S Hatch
1ddcd715fb
Reached 0.12, fix outputter test
2013-01-14 23:40:20 -07:00
Thomas S Hatch
ad452f0b64
clean up stray prints
2013-01-14 23:08:36 -07:00
Thomas S Hatch
7c8ca7e1d6
remove recursive git test
...
The problem here is that we will need to create a small static
git repo somewhere first, relying on the mozilla one causes
other tests to fail due to timeouts and makes the test run VERY
long
2013-01-14 22:55:24 -07:00
Thomas S Hatch
2ca04f4671
Stop downloading giant git repos in the test suite
...
THIS WAS NOT OK!!!
2013-01-14 22:51:21 -07:00
Thomas S Hatch
6aff022b98
Merge pull request #3269 from kjkuan/pydsl
...
A Python DSL(module and renderer) for generating Salt's highstate data structure.
2013-01-14 21:01:46 -08:00
Thomas S Hatch
a24ff1852a
remove unused import
2013-01-14 21:50:56 -07:00
Jack Kuan
791ca1cb44
Add test cases and fixed some corner cases.
2013-01-14 23:29:35 -05:00
Jack Kuan
a8b8a6eb18
Add a test module for pydsl and some bug fixes.
2013-01-14 23:29:35 -05:00
Pedro Algarvio
0bf51ba5b0
Allow a test to specify it's own run_function timeout. Increase timeout for some tests.
2013-01-14 14:07:58 +00:00
Pedro Algarvio
36955b4560
Fix integration.shell.matcher.MatchTest.test_ipcadr.
...
Was skipping because of the latest output changes and how output parsing was done.
2013-01-14 13:04:23 +00:00
Pedro Algarvio
2f3bb49f83
Fix getting the output of git describe into salt's version string. Added a test case for this too.
2013-01-14 12:35:42 +00:00
Michał Jarco
7f782afb14
Fixed jinja_tests.
...
File roots contains lists of paths for each env.
2013-01-14 08:58:27 +01:00
Pedro Algarvio
e9ca0a26d7
A little longer timeout.
2013-01-13 18:18:34 +00:00
Pedro Algarvio
3ff77c1958
Wait for the integration tests local client cmd's for, at most, 30 seconds.
2013-01-13 12:49:10 +00:00
Pedro Algarvio
633a313587
Lower integration tests local client timeout to 5 minutes.
2013-01-13 11:31:04 +00:00
