Pedro Algarvio
5a3fead6de
Allow the tests to be properly skipped
2014-11-20 17:16:09 +00:00
Pedro Algarvio
d651788dff
Allow the test cases to be properly skipped
2014-11-20 16:40:48 +00:00
Pedro Algarvio
76eb73b71e
Fix import
2014-11-20 16:40:48 +00:00
Pedro Algarvio
8ecd85edcc
Mock the right object
2014-11-20 16:40:48 +00:00
Pedro Algarvio
175cba7ff5
Fix imports
2014-11-20 16:40:47 +00:00
Pedro Algarvio
f37495c74f
Allow the test case to properly skip on missing tornado package
2014-11-20 16:40:47 +00:00
Pedro Algarvio
0e4f8de204
Use urlopen from six
2014-11-20 16:40:46 +00:00
Pedro Algarvio
13df58d2e6
Use urlopen and URLError from six
2014-11-20 16:40:45 +00:00
Pedro Algarvio
2bc6b735ef
Use urlencode from six
2014-11-20 16:40:45 +00:00
Pedro Algarvio
0937d2b4e1
Use urlencode from six
2014-11-20 16:40:45 +00:00
Sławek Ehlert
03f464c773
remove the leftovers from the previous file
2014-11-20 00:29:12 +01:00
Sławek Ehlert
e2e4bcf2ae
fix output of subsequent calls for `environ.setenv` state
...
Previously ``setenv`` function (from ``modules.environ``) was
called even if the environment was already in a proper state.
This caused ``highstate`` to always report changes to be applied
even if they were not required.
2014-11-19 23:56:09 +01:00
Colton Myers
716a7e3331
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/modules/bsd_shadow.py
salt/modules/freebsdjail.py
salt/modules/yumpkg.py
salt/modules/zfs.py
salt/modules/zypper.py
salt/netapi/rest_tornado/saltnado.py
salt/states/dockerio.py
2014-11-18 12:46:29 -07:00
Thomas Jackson
e2102fcbc7
Pylint cleanup
2014-11-14 09:15:54 -08:00
Colton Myers
9a89057f83
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/transport/__init__.py
2014-11-13 12:40:24 -07:00
Thomas Jackson
6f0552c9e1
Pylint fixes
2014-11-13 09:33:14 -08:00
Thomas Jackson
ebfee14fda
Add test for using a Future in multiple "Any" futures
2014-11-13 08:36:28 -08:00
Thomas Jackson
f0f9b14ee2
Add tests for MinionSaltAPIHandler
2014-11-13 08:36:27 -08:00
Thomas Jackson
26afdd34ae
Re-factor test cases
2014-11-13 08:36:27 -08:00
Thomas Jackson
4b8ac6a9e3
Add tests for auth handler
...
break unit tests for handlers into a separate file
Misc error handling fixes in Login handler
2014-11-13 08:36:26 -08:00
Thomas Jackson
6245c27391
Add tests for deserialize (and fix a few bugs in there)
...
More cleanup of websockets separation
2014-11-13 08:36:26 -08:00
Thomas Jackson
ecbd269eda
Move future testing out of event listener test class
2014-11-13 08:36:26 -08:00
Thomas Jackson
ecefbb91dc
Add tests for Any Futures
...
move eventlistener callbacks into the class
2014-11-13 08:36:26 -08:00
Thomas Jackson
3816236e26
Add test for event you don't want
2014-11-13 08:36:26 -08:00
Thomas Jackson
257a73fb69
Add first tests for rest_tornado!
2014-11-13 08:36:26 -08:00
Thomas S Hatch
03e2785281
lint
2014-11-11 10:03:22 -07:00
Thomas S Hatch
0ea13995de
lint
2014-11-11 10:01:33 -07:00
Thomas S Hatch
142efd56b0
Merge pull request #17574 from bechtoldt/tame_ipv6_regex_beat
...
Fix broken ipv6 address verification in salt.utils.validate.net
2014-11-10 18:57:57 -07:00
Arnold Bechtoldt
485796e9f9
use the right function to test
2014-11-11 02:14:58 +01:00
Arnold Bechtoldt
d03ff7d6dd
fix broken ipv6 address verification in salt.utils.validate.net
2014-11-11 01:42:46 +01:00
C. R. Oldham
8b8ab335cc
Merge pull request #17317 from cro/pg_role_quote_tests
...
Update tests to respect changes in pg module. Test failures are not related.
2014-11-10 16:51:43 -07:00
C. R. Oldham
0303154c31
Update tests to respect changes in postgres module
2014-11-10 14:37:44 -07:00
Thomas Jackson
f24c94dd7b
Pylint fixes
2014-11-10 13:03:35 -08:00
Thomas S Hatch
7300d3ac6a
Merge pull request #17291 from ashb/gem_bin
...
Allow specifying custom `gem` to use in gem state and module
2014-11-10 09:37:29 -07:00
Thomas S Hatch
8862c2e829
Merge pull request #17290 from plastikos/improvement-yaml_encode
...
Add yaml_encode() jinja filter
2014-11-10 09:35:39 -07:00
Thomas Jackson
c43ac0a4c2
remove comment from local debugging
2014-11-10 08:33:39 -08:00
Thomas Jackson
e862642ff7
Add tests for SREQ class
...
revert keys() change to socket dicts since we will mutate the dict on iteration
2014-11-10 08:29:58 -08:00
Pedro Algarvio
1071ec0859
Merge branch '2014.7' into develop
2014-11-09 14:19:33 +00:00
Pedro Algarvio
ed321a4898
Don't reset the template registry
2014-11-09 14:17:15 +00:00
Ash Berlin
b1e57b82ea
Allow specifying custom gem to use in gem state and module
...
Better late than never - here is a PR for issue #13202
2014-11-09 01:06:08 +00:00
Pedro Algarvio
d8315ebd32
Merge branch '2014.7' into develop
2014-11-08 09:39:55 +00:00
Justin Findlay
ba1ce3dfc5
pylint fixes
2014-11-08 00:33:02 -07:00
Thayne Harbaugh
e4488a3956
Add yaml_encode() jinja filter
...
* Add documentation for yaml_encode()
* Mention yaml_encode() in formulas documentation
* Add unit tests for yaml_encode()
* Improve unit tests and documentation for related yaml_dquote()
2014-11-07 19:12:58 -07:00
Justin Findlay
9e9903c521
add unit tests for salt/modules/cp.py
2014-11-07 16:35:25 -07:00
Thomas S Hatch
656817141c
Merge pull request #17210 from hulu/typos-galore
...
fix numerous typos+misspellings
2014-11-06 14:25:53 -07:00
Thomas S Hatch
e4be523ee4
Merge pull request #17234 from thatch45/bemehow-get_vpc_id
...
Merge #17181
2014-11-06 14:06:56 -07:00
Joseph Hall
e1487b330b
Merge pull request #17222 from hulu/typos-2-electric-boogaloo
...
more typo/misspelling fixes
2014-11-06 11:41:07 -07:00
Thomas S Hatch
1e74ae2c5f
lint fixes
2014-11-06 11:05:37 -07:00
Thomas S Hatch
4e49453952
Merge branch 'get_vpc_id' of https://github.com/bemehow/salt into bemehow-get_vpc_id
2014-11-06 11:03:55 -07:00
Chris Rebert
802a631dd9
more typo/misspelling fixes
2014-11-05 15:29:25 -08:00
