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
55,747 Commits 24 Branches 182 Tags 341 MiB
727e322188
Commit Graph

5364 Commits

Author SHA1 Message Date
Gareth J. Greenaway
d68cd6f646 fixing unit tests related to schedule jobs in pillar. 2015-06-13 08:49:26 -07:00
Gareth J. Greenaway
56ee5b707c updating unit tests to reflect changes. 2015-06-12 21:56:58 -07:00
Mike Place
d23a6695a4 Remove overstate tests 2015-06-12 13:00:08 -06:00
Colton Myers
5b49e89b43 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-12 11:42:42 -06:00
Justin Findlay
01092c2337 Merge pull request #24628 from jayeshka/reg_states-unit-test 
adding states/reg unit test case.
 2015-06-12 11:29:11 -06:00
Jayesh Kariya
af1bd8f9ff adding states/reg unit test case. 2015-06-12 17:23:41 +05:30
Brett Mack
6ca1dbd65c Don't split multiline values into a list if wrapped inside " 
Use salt.utils.dictupdate to merge dictionaries
 2015-06-12 03:46:28 +01:00
Brett Mack
1bbaf0e9a0 More style guideline fixes 2015-06-12 03:46:28 +01:00
Brett Mack
2ce52ee95f Style changes to bring code in line with coding standards 2015-06-12 03:46:28 +01:00
Brett Mack
fed5ce8e4b Use consul as an external pillar source. Requires python-consul 2015-06-12 03:46:28 +01:00
Colton Myers
21d9df2831 Merge pull request #24606 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-11 16:57:11 -06:00
Michael Steed
5eb097e584 py3: fix tests/unit/states/cron_test.py 2015-06-11 16:26:10 -06:00
Michael Steed
846e1a2378 py3: fix tests/unit/stateconf_test.py 2015-06-11 16:20:41 -06:00
Michael Steed
ca34897d2c py3: fix salt/modules/win_status.py and tests 2015-06-11 15:39:39 -06:00
Michael Steed
e7620a2c30 py3: fix tests/unit/states/modjk_test.py 2015-06-11 15:16:17 -06:00
Michael Steed
56941f9432 rm pdb invocation :/ 2015-06-11 15:07:52 -06:00
Michael Steed
6f0da2a9a8 py3: (mostly) fix tests/unit/pydsl_test.py 
One test is still failing under python 3
 2015-06-11 15:05:30 -06:00
Justin Findlay
d88fb22fdc fix pkg module integration tests on CentOS 5 2015-06-11 14:56:52 -06:00
Nicole Thomas
22c44490b0 Merge pull request #24602 from msteed/py3-fix-ascii-arch 
Undo the memoization of contrived locale
 2015-06-11 13:55:37 -06:00
Colton Myers
725e5c689f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-11 13:15:38 -06:00
Justin Findlay
fb91b40ba0 fix pkg module integration tests on ubuntu 12 2015-06-11 12:46:22 -06:00
Michael Steed
91aeaabb7c undo the memoization of contrived locale 2015-06-11 12:13:07 -06:00
Michael Steed
4b6b4d1cad py3: fix tests/unit/pillar_test.py 
- write bytes to temp files
- work around py3 mock bug
 2015-06-11 10:33:00 -06:00
Justin Findlay
5a21ad152e Merge pull request #24593 from jayeshka/redismod_states-unit-test 
adding states/redismod unit test case.
 2015-06-11 09:55:27 -06:00
Justin Findlay
8ffb86edd0 Merge pull request #24581 from rallytime/disable_some_flaky_tests 
Disabled some flaky tests until we can figure out how to make them more reliable
 2015-06-11 09:51:41 -06:00
Mike Place
39ef4f3209 Merge pull request #24584 from cachedout/unit_warnings 
Fix unit test warnings
 2015-06-11 20:47:59 +05:30
Jayesh Kariya
3b95744840 adding states/redismod unit test case. 2015-06-11 17:42:15 +05:30
Damian Myerscough
7ceffd4c54 Additional riak functions 2015-06-10 22:14:03 -07:00
Thomas S Hatch
5ec9d331cf Merge pull request #24124 from ticosax/mine-dockerng 
[dockerng] Migrate salt.mine to dockerng
 2015-06-10 20:15:17 -06:00
Thomas S Hatch
a570d7f967 Merge pull request #24566 from jayeshka/rdp_states-unit-test 
adding states/rdp unit test case.
 2015-06-10 20:14:39 -06:00
Thomas S Hatch
d3feedd174 Merge pull request #24557 from msteed/py3-unittests-4 
More py3 unittest fixes
 2015-06-10 20:14:14 -06:00
Thomas S Hatch
14c22e66f4 Merge pull request #24552 from joejulian/develop_dont_pollute_environment 
Don't pollute the TZ environment variable
 2015-06-10 20:13:21 -06:00
Thomas S Hatch
5df5fb002e Merge pull request #24519 from dmyerscough/riak-module 
Additional Riak features with error messages printed
 2015-06-10 20:10:29 -06:00
Thomas S Hatch
94067fdc72 Merge pull request #24511 from jquast/rabbitmq-trailing-outp-fix 
bugfix: trailing "...done" in rabbitmq output
 2015-06-10 20:09:23 -06:00
Mike Place
b3b1536afd Derp 2015-06-10 15:50:53 -06:00
Mike Place
7e153bc6a9 Fix unit test warnings 2015-06-10 15:37:01 -06:00
rallytime
c82f135d2e Disabled some flaky tests until we can figure out how to make them more reliable 2015-06-10 14:04:14 -06:00
Michael Steed
63531c2a3d fix failing unit test 
Reload the locales module to discard the memoization of get_encodings()
 2015-06-10 10:55:51 -06:00
Jayesh Kariya
273b994e91 adding states/rdp unit test case. 2015-06-10 18:41:29 +05:30
Nicolas Delaby
1e8e082f40 Migrate salt.mine to dockerng 2015-06-10 08:59:03 +02:00
Damian Myerscough
a8254f1602 Fixing pylint errors 2015-06-09 22:29:44 -07:00
Damian Myerscough
59e04d163c Fixing unittests for new functionality 2015-06-09 20:52:41 -07:00
Jeff Quast
a154280b34 bugfix: trailing "...done" in rabbitmq output 
Problem
-----------

Some versions of rabbitmq (v3.4.1) does not output any final
"...done" line in output of listings, but the given salt code
unconditionally removed the final line of output, which may
often result in inconsistent behavior of dependent state
functions, where the final line has a value that is significant.

Solution
-----------

This bugfix changes this output manipulation to be conditional,
matching only lines of ``"Listing ..."`` as the first, and
``"...done"`` as the last.

Details
---------

In my environment::

    [rabbitmq@db01 ~]$ rabbitmqctl list_vhosts
    Listing vhosts ...
    /

This causes issues in, for example, a vhost is attempted to
be created for '/' that already exists, if that vhost happens
to be the last one listed in command output, it is thought
non-existent, resulting in state failure::

    Failure: rabbitmq_vhost_|-rabbitmq-vhost_|-/_|-present: Creating vhost "/" ...
    Error: vhost_already_exists: /
 2015-06-09 17:30:40 -07:00
Nicole Thomas
eced487657 Merge pull request #24542 from msteed/py3-fix-arch 
py3: fix arch failures
 2015-06-09 17:49:52 -06:00
Michael Steed
24343645c3 py3: fix salt/utils/locales 
fix str/bytes/unicode handling
add unit tests
 2015-06-09 16:59:43 -06:00
Joe Julian
91998936a9 Don't pollute the TZ environment variable 
Fixes #24480
 2015-06-09 14:40:37 -07:00
Joe Julian
cfc3b43ba2 Don't pollute the TZ environment variable 2015-06-09 14:26:27 -07:00
Michael Steed
f43d5631f1 py3: fix tests/unit/modules/win_status_test.py 
Use types.ModuleType() instead of new.module()
 2015-06-09 15:14:51 -06:00
Michael Steed
ddde2e1e39 use a realistic service sid in test_getsid() 2015-06-09 14:50:30 -06:00
Michael Steed
f9cf15ad46 fix new failures on ubuntu 14.04 2015-06-09 14:18:04 -06:00
Michael Steed
afbd52bad7 py3: fix tests/unit/modules/win_network_test.py 
Use types.ModuleType() instead of deprecated new.module()
 2015-06-09 14:08:44 -06:00
Michael Steed
6abd6d2623 py3: fix tests/unit/modules/win_dns_client_test.py 
Use types.ModuleType() instead of deprecated new.module()
 2015-06-09 14:06:38 -06:00
Joe Julian
76e2583265 Merge tls changes from develop 2015-06-09 12:48:36 -07:00
Michael Steed
f725b8e4fe lint 2015-06-09 13:14:54 -06:00
Michael Steed
de7fe49830 py3: fix tests/unit/modules/virt_test.py 
In libvirt_domain.jinja, use disk.items() instead of the py2-only
iteritems(). The number of disks should be small enough for this not to
matter.

in virt_test.py, don't rely on the py2 behavior of str/int comparison,
and don't rely on dict.keys() being indexable.
 2015-06-09 13:06:44 -06:00
Michael Steed
0543f9aa0d fix tests/unit/modules/network_test.py 
Explicitly test salt.ext.ipaddress in test_is_private() and
test_is_loopback() as originally intended.
 2015-06-09 12:13:04 -06:00
Michael Steed
8669dacaf1 likewise in test_render_with_utf8_syntax_error() 2015-06-09 11:48:13 -06:00
Michael Steed
4b34b60623 set encoding in test_render_with_unicode_syntax_error() 2015-06-09 11:43:23 -06:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
 2015-06-09 11:41:07 -06:00
Michael Steed
ce5f14bb0e set encoding in test__unicode_match() 2015-06-09 11:19:51 -06:00
Michael Steed
f85a3e39da specify encoding in test_to_str() 2015-06-09 11:13:19 -06:00
Michael Steed
cb2985732d py3: fix salt/crypt.py 
- Open key files in binary mode since the PyCrypto key import/export
  routines use bytes
- Add unit tests for the easy stuff not covered elsewhere
 2015-06-09 10:19:06 -06:00
Justin Findlay
73e6388acd Merge pull request #24495 from jayeshka/rabbitmq_vhost_states-unit-test 
adding states/rabbitmq_vhost unit test case.
 2015-06-09 09:33:23 -06:00
Justin Findlay
bf1abccebe Merge pull request #24445 from jayeshka/pyrax_queues_states-unit-test 
adding states/pyrax_queues unit test case.
 2015-06-09 09:28:45 -06:00
Thomas S Hatch
06279dd9b0 Merge pull request #24514 from msteed/py3-unittests-3 
More py3 unittest fixes
 2015-06-09 09:10:35 -06:00
Jayesh Kariya
31889e38eb cosmetic change. 2015-06-09 19:44:16 +05:30
Jayesh Kariya
cf501cf60d resolved error. 2015-06-09 18:10:37 +05:30
Jayesh Kariya
4bb6087722 Merge branch '2015.5' of https://github.com/saltstack/salt into rabbitmq_vhost_states-unit-test 2015-06-09 18:09:05 +05:30
Nicole Thomas
87e1c6008c Merge pull request #24459 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-08 22:27:08 -06:00
Nicole Thomas
fce998a58b Merge pull request #24497 from jayeshka/rbenv_states-unit-test 
adding states/rbenv unit test case.
 2015-06-08 21:56:09 -06:00
Joe Julian
4a840f39d5 Fix tls test to work against develop branch 2015-06-08 17:36:29 -07:00
Joe Julian
048713747c Revert "Disable tls tests (for now)" 
This reverts commit 5833a0e535.
 2015-06-08 16:29:23 -07:00
Michael Steed
cb83dbf87e py3: fix tests/unit/modules/pkg_resource_test.py 
Mock the correct next()
 2015-06-08 16:18:00 -06:00
Michael Steed
03ba3c4b1d py3: fix tests/unit/modules/network_test.py 
Mock whichever ipaddress modules was imported by the network module
 2015-06-08 16:16:52 -06:00
Michael Steed
cded6bfc70 py3: fix salt/modules/rh_ip.py and tests 
- use six-wrapped StringIO
- fix int/str comparison
 2015-06-08 16:14:35 -06:00
Michael Steed
980e799122 py3: fix salt/modules/postgres.py and tests 
- In db_create(), use an OrderedDict for options. This probably doesn't
  matter in production, but a deterministic order makes the unit test
  work across python 2 and 3.
- Use six-abstracted StringIO
- Use 0 instead of None as the expected successful return code
- Pass bytes instead of str to hashlib.md5()
 2015-06-08 16:08:10 -06:00
Michael Steed
f163e50368 py3: fix salt/modules/network.py and friends 
- dry: move mac address string-to-bytes conversion into a single routine
- add unit tests for said conversion routine
 2015-06-08 16:03:19 -06:00
Colton Myers
5833a0e535 Disable tls tests (for now) 2015-06-08 15:27:47 -06:00
Michael Steed
97be5d7551 py3: fix tests/unit/modules/ini_manage_test.py 2015-06-08 08:49:14 -06:00
Michael Steed
bd8538db97 py3: fix salt/modules/file.py and unit tests 
Most of the routines in the file execution module that operate on file
contents assume that they are dealing with text files (line-oriented
operations, regular expressions, etc). The exceptions are get_sum(),
get_hash(), and check_hash(). Outside of these three routines, files are
now opened in text mode.
 2015-06-08 08:49:09 -06:00
Michael Steed
3c5e82e878 py3: fix tests/unit/modules/deb_apache_test.py 2015-06-08 08:48:55 -06:00
Michael Steed
a4c8e3172d py3: fix salt/utils/rsax931.py and tests 2015-06-08 08:48:48 -06:00
Michael Steed
a1b693a9d1 fix failure in btrfs_test.py 
test was failing on machines where /dev/sda3 was mounted
 2015-06-08 08:48:33 -06:00
Jayesh Kariya
79d343a62b adding states/rbenv unit test case. 2015-06-08 18:24:24 +05:30
Jayesh Kariya
3ad77143a8 adding states/rabbitmq_vhost unit test case. 2015-06-08 18:23:15 +05:30
Jayesh Kariya
7d96f27f91 adding states/rabbitmq_user unit test case. 2015-06-08 17:47:04 +05:30
Michael Steed
83a96367a4 Manual merge of #24414 per thatch45 2015-06-06 07:47:52 -06:00
Colton Myers
9cf402e0a7 Python3 compat 2015-06-05 13:52:35 -06:00
Colton Myers
6d503c12ea Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/modules/all/salt.modules.system_profiler.rst
    salt/fileclient.py
    salt/loader.py
    salt/modules/tls.py
    salt/modules/win_path.py
    salt/states/pkg.py
    salt/utils/event.py
    salt/utils/pagerduty.py
    tests/unit/modules/seed_test.py
 2015-06-05 13:03:48 -06:00
Colton Myers
c0ff4110ab Merge pull request #24398 from makinacorpus/aptv 
VirtualName for states.apt
 2015-06-05 11:40:04 -06:00
Justin Findlay
36263405be Merge pull request #24447 from jayeshka/rabbitmq_policy_states-unit-test 
adding states/rabbitmq_policy unit test case.
 2015-06-05 09:26:10 -06:00
Jayesh Kariya
9b038abd63 adding states/rabbitmq_policy unit test case. 2015-06-05 17:35:31 +05:30
Jayesh Kariya
cb0c99a012 adding states/rabbitmq_plugin unit test case. 2015-06-05 17:33:49 +05:30
Jayesh Kariya
ea27cefb10 adding states/pyrax_queues unit test case. 2015-06-05 17:32:19 +05:30
Mathieu Le Marec - Pasquet
785d27707f VirtualName for states.apt 
This fixes #24397

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-06-05 09:45:52 +02:00
Gareth J. Greenaway
c95f8be0ae Updating unit tests based on changes to module. 2015-06-04 20:33:52 -07:00
Justin
1df4020ec2 Changed mock path to be absolute in test_parse_targets 2015-06-04 11:11:33 -06:00
Justin Findlay
deaee68b89 Merge pull request #24371 from joejulian/2015.5_tls_module_tests 
2015.5 tls module tests
 2015-06-04 09:20:16 -06:00
Justin Findlay
84686ee695 Merge pull request #24403 from jayeshka/process_states-unit-test 
adding states/process unit test case.
 2015-06-04 09:19:01 -06:00
Justin Findlay
35de8d72db Merge pull request #24402 from jayeshka/pyenv_states-unit-test 
adding states/pyenv unit test case.
 2015-06-04 09:18:11 -06:00
Justin Findlay
632f838838 Merge pull request #24401 from jayeshka/powerpath-states-unit-test 
adding states/powerpath unit test case.
 2015-06-04 09:17:46 -06:00
Jayesh Kariya
5f263ab48b adding states/pyenc unit test case. 2015-06-04 17:50:04 +05:30
Jayesh Kariya
fcb71fb35e adding states/process unit test case. 2015-06-04 17:49:04 +05:30
Jayesh Kariya
49ff9272ce adding states/powerpath unit test case. 2015-06-04 17:47:39 +05:30
Christophe Drevet-Droguet
7b9451451f module grains tests: test list order preservation 2015-06-04 09:52:09 +02:00
Justin
7570ae9132 Disabled flaky test to review later 2015-06-03 16:27:33 -06:00
Joe Julian
4c5dee1e25 Add @destructiveTest decorator to destructive tests 2015-06-03 15:27:05 -07:00
Colton Myers
baf4337918 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/lxc.py
    salt/roster/clustershell.py
 2015-06-03 13:47:08 -06:00
Colton Myers
d710489794 Merge pull request #24347 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-03 09:38:49 -06:00
Thomas S Hatch
ae681a4db1 Merge pull request #24313 from nicholascapo/fix-22991-npm.installed-test-true 
Fix #22991 Correctly set result when test=True
 2015-06-03 08:49:18 -06:00
Thomas S Hatch
d57a9a267c Merge pull request #24312 from nicholascapo/fix-18966-file.serialize-test-true 
Fix #18966: file.serialize supports test=True
 2015-06-03 08:49:06 -06:00
Jayesh Kariya
fd1d834688 adding states/postgres_user unit test case. 2015-06-03 18:17:42 +05:30
Jayesh Kariya
0558b0d744 adding states/postgres_schema unit test case. 2015-06-03 18:16:27 +05:30
Thomas S Hatch
6b694e3495 Merge pull request #24302 from jfindlay/pkg_tests 
fix pkg hold/unhold integration test
 2015-06-02 21:27:43 -06:00
Joe Julian
274bbd4d43 Accept results from older pyOpenSSL 2015-06-02 18:17:05 -07:00
Joe Julian
161f913522 All cert info should be in UTC always 2015-06-02 18:17:05 -07:00
Joe Julian
9affcca766 See the whole diff if dict compare fails 2015-06-02 18:17:05 -07:00
Joe Julian
94f620857c Ignore extensions for now. Resolve this as part of fixing issue 24338. 2015-06-02 18:17:04 -07:00
Joe Julian
84904d31f1 Mask lint warning for unused imported module 2015-06-02 18:17:04 -07:00
Joe Julian
5675b78459 Do not test if PyOpenSSL is not installed 2015-06-02 18:17:04 -07:00
Joe Julian
563cc66311 Add tls tests 2015-06-02 18:17:04 -07:00
Nicholas Capo
ac9644cb19 Fix #22991 npm.installed correctly set result on test=True 2015-06-02 18:09:19 -05:00
Colton Myers
288d49e51c Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/ipmi.py
 2015-06-02 15:51:50 -06:00
Nicholas Capo
e7328e7043 Fix #18966 file.serialize correctly set result on test=True 
* Use file.check_managed_changes to diff the file when test=True
 2015-06-02 15:50:28 -05:00
Justin Findlay
c2db0b1758 fix pkg hold/unhold integration test 2015-06-02 11:56:18 -06:00
Christophe Drevet-Droguet
756f5d8716 new set function for module grains, and unit tests 2015-06-02 15:41:26 +02:00
Jayesh Kariya
a162ffa3d8 adding states/postgres_group unit test case. 2015-06-02 17:21:25 +05:30
Jayesh Kariya
3d465a574a adding states/postgres_extension unit test case. 2015-06-02 17:20:09 +05:30
Jayesh Kariya
ee06f1ad57 adding states/postgres_database unit test case. 2015-06-02 17:18:55 +05:30
Christophe Drevet-Droguet
8a63d1ebbe fix state grains silently fails #24319 2015-06-02 13:29:59 +02:00
Christophe Drevet-Droguet
ca1af20203 grains state: add some tests 2015-06-02 13:29:52 +02:00
Colton Myers
6d385280dc Merge pull request #24300 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-01 15:21:40 -06:00
Thomas S Hatch
ac1134af22 Merge pull request #24188 from aneeshusa/add-sqlite-pillar 
Add sqlite3 pillar
 2015-06-01 11:45:15 -06:00
Colton Myers
a6a868be6b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/iptables.py
    salt/utils/dictupdate.py
 2015-06-01 10:29:32 -06:00
Justin Findlay
98944d8c7f fix pkg test on ubuntu 12.04 for realz 2015-05-31 22:23:17 -06:00
Nicole Thomas
e7542e7a38 Merge pull request #24236 from jdsieci/develop 
RedHat IPv6 static routes
 2015-05-30 21:34:24 -06:00
Jerzy Drozdz
2f3d0298af pylint volation fixes 2015-05-30 02:04:49 +02:00
Colton Myers
5fcbcfe6d5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    doc/topics/tutorials/index.rst
    salt/cloud/clouds/digital_ocean.py
    salt/modules/lxc.py
    salt/returners/__init__.py
 2015-05-29 17:33:28 -06:00
Thomas S Hatch
3d885c04f0 Merge pull request #24257 from jfindlay/pkg_tests 
fix pkg mod integration test on ubuntu 12.04
 2015-05-29 17:09:00 -06:00
Jerzy Drozdz
9eb9892516 Changed return values and assertions to lists 2015-05-30 01:03:43 +02:00
Thomas S Hatch
a28515aa2c Merge pull request #23060 from makinacorpus/service 
ubuntu systemd/legacy init support
 2015-05-29 17:02:08 -06:00
Colton Myers
75590cf490 Merge pull request #24080 from makinacorpus/lxc_consistency2 
Lxc consistency2
 2015-05-29 16:51:54 -06:00
Jerzy Drozdz
e564a0b473 Added setting of __grains__['osrelease'] in test 2015-05-30 00:16:25 +02:00
Justin Findlay
9508924c02 fix pkg mod integration test on ubuntu 12.04 2015-05-29 15:52:57 -06:00
Colton Myers
90cb448910 Fix rest of rabbitmq tests 2015-05-29 15:11:25 -06:00
Colton Myers
7736509c6b Fix rabbitmq test 2015-05-29 15:11:19 -06:00
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
 2015-05-29 15:10:13 -06:00
Jayesh Kariya
c23356500b adding states/quota unit test case. 2015-05-29 13:19:33 +05:30
Jayesh Kariya
9b9aeb8628 resolved all erors. 2015-05-29 12:49:23 +05:30
Nicole Thomas
e15142c629 Merge pull request #24217 from jfindlay/disable_bad_tests 
disable intermittently failing tests
 2015-05-28 21:08:39 -06:00
Nicole Thomas
ce8e43b774 Merge pull request #24199 from lyft/route53-fix-elb 
Various fixes for boto_route53 and boto_elb
 2015-05-28 21:02:41 -06:00
Aneesh Agrawal
4b9311507c Add new module type for serializers from issue #22257. 
Move existing serializers from salt.utils.serializers to
salt.serializers.
 2015-05-28 20:03:11 -04:00
Ryan Lane
d8dc9a7b5b Better unit tests for boto_elb state 2015-05-28 16:52:24 -07:00
Thomas S Hatch
526698ba8d Merge pull request #24208 from jayeshka/ports-states-unit-test 
adding states/ports unit test case.
 2015-05-28 17:06:33 -06:00
Justin Findlay
6b6280442c disable intermittently failing tests 
This commit is to be reverted when #23623 is merged.
 2015-05-28 16:23:57 -06:00
Thomas S Hatch
3dc4b85295 Merge pull request #24190 from msteed/issue-23815 
Fix issue 23815
 2015-05-28 14:10:34 -06:00
Ryan Lane
62f214b535 Remove cnames_present test 2015-05-28 10:21:15 -07:00
Jayesh Kariya
aaf89354c0 adding win_groupadd unit test case. 2015-05-28 17:12:58 +05:30
Jayesh Kariya
657b709932 adding states/ports unit test case. 2015-05-28 17:11:41 +05:30
Nicole Thomas
fd41993022 Merge pull request #24157 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-27 16:09:00 -06:00
Colton Myers
116b88dac3 Fix mocking in file state unit tests 2015-05-27 14:55:34 -06:00
Nicole Thomas
7e400bc3d7 Merge pull request #24166 from jayeshka/pkgng-states-unit-test 
adding states/pkgng unit test case.
 2015-05-27 14:27:49 -06:00
Michael Steed
086a1a94e8 lint 2015-05-27 13:36:25 -06:00
Michael Steed
db9f6820b8 add inotify beacon unit tests 2015-05-27 13:26:36 -06:00
Colton Myers
9dab9a1dda Fix python3 lint 2015-05-27 13:07:47 -06:00
Aneesh Agrawal
ac4792f68d Add a SQLite3 ext_pillar built on the sql_base pillar. 2015-05-27 14:45:33 -04:00
Aneesh Agrawal
decb6cef97 Extract PEP 249 compliant sql_base ext_pillar from MySQL. 
Refactor the mysql ext_pillar so all PEP 249 generic code is in
sql_base to allow for easy addition of new ext_pillars.
 2015-05-27 14:45:33 -04:00
Nicole Thomas
2303dec0e9 Merge pull request #24181 from jtand/file_test 
Fixed error where file was evaluated as a symlink in test_absent
 2015-05-27 12:26:28 -06:00
Nicole Thomas
a16276852b Merge pull request #24180 from terminalmage/fix-libvirt-test 
Skip libvirt tests if not running as root
 2015-05-27 12:18:47 -06:00
Nicole Thomas
1fbc5b25e6 Merge pull request #24165 from jayeshka/portage_config-states-unit-test 
adding states/portage_config unit test case.
 2015-05-27 11:15:08 -06:00
Nicole Thomas
4747856411 Merge pull request #24164 from jayeshka/pecl-states-unit-test 
adding states/pecl unit test case.
 2015-05-27 11:14:26 -06:00
Justin
5f0e601589 Fixed error where file was evaluated as a symlink in test_absent 2015-05-27 11:08:50 -06:00
Erik Johnson
72e7416ad2 Skip libvirt tests if not running as root 
Running salt.states.libvirt.keys() results in an OSError if the pki dir
needs to be created.
 2015-05-27 11:53:26 -05:00
Jayesh Kariya
8cf1505392 adding states/portage_config unit test case. 2015-05-27 14:55:31 +05:30
Jayesh Kariya
2234bb0b70 adding states/pkgng unit test case. 2015-05-27 14:54:19 +05:30
Jayesh Kariya
563a5b3c30 adding states/pecl unit test case. 2015-05-27 14:52:19 +05:30
Jayesh Kariya
1af8c8334d adding states/pagerduty unit test case. 2015-05-27 14:51:19 +05:30
Colton Myers
60f2e9eefb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/development/contributing.rst
    salt/modules/tls.py
 2015-05-26 16:38:42 -06:00
Doug Luce
6fe47ea1f4 Allow URL specification of NPM packages 
If an NPM package was specified as a
url (i.e. git://github.com/Unitech/pm2), the state would crash with an
IndexError.  Assume that not every package installed globally is
specified with a URL.

Example failing state:

kvsio:
  npm.installed:
      - name: git+ssh://github.com/dougluce/kvs.io.git
 2015-05-26 13:19:17 -07:00
rallytime
ac0f97de51 Fixes the boto_vpc_test failure on CentOS 5 tests 
pkg_resources.get_distribution doesn't work on CentOS 5 since it looks
for moto in site-packages and not pip (which is how we're installing it
in the salt-jenkins states).

This catches the exception through by get_distribution so we can run the
rest of the tests in this file.
 2015-05-26 12:25:51 -06:00
Justin Findlay
a83371e0ed Merge pull request #24131 from jayeshka/mysql_user-states-unit-test 
adding states/mysql_user unit test case
 2015-05-26 09:58:10 -06:00
Justin Findlay
1dc1d2a6e5 Merge pull request #24130 from jayeshka/ntp-states-unit-test 
adding states/ntp unit test case
 2015-05-26 09:57:29 -06:00
Justin Findlay
39434179a8 Merge pull request #24128 from jayeshka/openstack_config-states-unit-test 
adding states/openstack_config unit test case
 2015-05-26 09:56:07 -06:00
Jayesh Kariya
ca09e0f7c1 adding states/openstack_config unit test case 2015-05-26 15:28:14 +05:30
Jayesh Kariya
ede4a9f2f1 adding states/ntp unit test case 2015-05-26 15:26:50 +05:30
Jayesh Kariya
c3ecabbae0 adding states/npm unit test case 2015-05-26 15:25:59 +05:30
Jayesh Kariya
ed1ef69856 adding states/mysql_user unit test case 2015-05-26 15:24:43 +05:30
Thomas S Hatch
f76622ad67 Merge pull request #24076 from garethgreenaway/refactoring_schedule_module 
Refactoring schedule module
 2015-05-25 13:45:50 -06:00
Thomas S Hatch
dd90ef09b9 Merge pull request #24078 from jfindlay/locale_charmap 
if a charmap is not supplied, set it to the codeset
 2015-05-25 13:39:19 -06:00
Thomas S Hatch
9cec5d3dc9 Merge pull request #24088 from jfindlay/pkg_tests 
pkg module integration tests
 2015-05-25 13:39:02 -06:00
Justin Findlay
ec509ed272 Merge pull request #24108 from jayeshka/mysql_query-states-unit-test 
adding states/mysql_query unit test case
 2015-05-25 06:30:48 -06:00
Justin Findlay
f2e5d6c2fd Merge pull request #24110 from jayeshka/varnish-unit-test 
adding varnish unit test case
 2015-05-25 06:30:21 -06:00
Jayesh Kariya
e11988969f adding varnish unit test case 2015-05-25 16:01:02 +05:30
Jayesh Kariya
ec50450460 adding states/mysql_query unit test case 2015-05-25 15:59:25 +05:30
Jayesh Kariya
11a93cb80c adding states/mysql_grants unit test case 2015-05-25 15:58:10 +05:30
Mathieu Le Marec - Pasquet
458f50617b seed: lint 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-24 14:50:24 +02:00
Mathieu Le Marec - Pasquet
96b8d55f14 Fix seed.mkconfig yamldump 
This fixes #24071

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-24 14:07:07 +02:00
Jayesh Kariya
7d59deb3d6 adding states/file unit test case 2015-05-23 22:22:32 -06:00
Justin Findlay
f1bd5ec404 adding pkg module integration tests 2015-05-23 19:34:37 -06:00
Nicolas Delaby
82ee2da750 Enforce environment values to be strings. 2015-05-23 15:52:36 +02:00