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
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
Evan Borgstrom
7ed0eb576e
Switch double to single quotes, fix pylint warning
2014-02-20 10:23:57 -05: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