valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,001 Commits 24 Branches 182 Tags 341 MiB
9c4dd8232a
Commit Graph

1971 Commits

Author SHA1 Message Date
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
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
059ed16d02 Remove unused import 2014-02-12 15:37:15 +00:00
Pedro Algarvio
7465f0511f Remove unused import 2014-02-12 15:36:17 +00:00
Pedro Algarvio
c15526852a Remove unused imports 2014-02-12 15:35:14 +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
Mike Place
06a8ae4fc4 Merge pull request #10369 from rallytime/dig_test 
all methods in dig.py are tested
 2014-02-11 15:11:55 -07:00
rallytime
c2f8f2bfa0 all methods in dig.py are tested 2014-02-11 15:07:42 -07:00
Mike Place
012e4ed900 Merge pull request #10366 from rallytime/dig_test 
More dig tests
 2014-02-11 14:33:17 -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
Mike Place
c869ce6319 Merge pull request #10357 from rallytime/dig_test 
Wrote more Dig tests
 2014-02-11 12:10:23 -07: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
Erik Johnson
98bcd26139 Fix pkg test with dots in filename 
The package here is much smaller and should install quicker than the old
one.
 2014-02-11 11:22:34 -06:00
Thomas S Hatch
8ce74e0378 disable dot test, need to find another package 2014-02-11 09:41:10 -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
Thomas S Hatch
3b045d7719 Merge pull request #10319 from plastikos/issue-10318 
Do not fail if the system does not support IPv6
 2014-02-10 12:10:20 -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
362e162496 Remove un-necessary code 2014-02-10 15:10:19 +00:00
Pedro Algarvio
ec5614bd08 Remove the vim jedi output from the code 2014-02-10 13:28:28 +00:00
Pedro Algarvio
74dae3b842 And, as a last resort, kill the process after failing to terminate them. 2014-02-10 13:11:09 +00:00
Pedro Algarvio
8561be1fee For output consistency. 2014-02-09 00:21:18 +00: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