valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,194 Commits 24 Branches 182 Tags 341 MiB
318c2ed6a1
Commit Graph

3967 Commits

Author SHA1 Message Date
Stephen Woodrow
c695a57ba9 Fix tests. 2015-11-24 18:09:12 -08:00
Colton Myers
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -07:00
Mike Place
81bf332be4 Migrate pydsl tests to integration test suite 
This marks the beginning of a migration of the pydsl renderer tests
to the integration test suite and away from the unit test suite.

The unit test approach is becoming too difficult to maintain due to its complex approach to trying to internally manage a highstate run instead of calling into the salt state system to fully manage it.
 2015-11-24 15:46:14 -07:00
Dmitry Kuzmenko
f20d2aa43e ACL test update and fixes 2015-11-24 17:35:17 +03:00
Dmitry Kuzmenko
de5890a346 ACL function args: test and fixes 2015-11-24 17:35:17 +03:00
Dmitry Kuzmenko
3b9c4d2b35 Fixed LoadAuthTestCase 2015-11-24 17:35:16 +03:00
Nicolas Delaby
e98d18ba41 Expose docker networking as state 2015-11-24 13:55:22 +01:00
Nicolas Delaby
17ff5c1ab5 Add expose networking to modules.dockerng 2015-11-24 13:55:22 +01:00
Mike Place
30d0e7a0c2 Merge pull request #29008 from k00mi/develop 
Make systemd service state less slow
 2015-11-19 14:54:48 -07:00
Justin Findlay
9a4959a42b systemd module: new unit test for available 2015-11-19 13:29:08 -07:00
Mike Place
b692ab1cfb Merge pull request #29047 from schwing/fix-gpg-exception 
Fix salt.modules.gpg.import_key exception: 'GPG_1_3_1 referenced before assignment'
 2015-11-19 12:07:36 -07:00
John Schwinghammer
813f6e6808 Fix 'GPG_1_3_1 referenced before assignment' 
- Fix gpg.import_key() exception:
    "local variable 'GPG_1_3_1' referenced before assignment"
- Update the unit tests to test both the gpg.GPG_1_3_1=True and
gpg.GPG_1_3_1=False cases.
 2015-11-19 09:27:46 -06:00
Mike Place
83e50d2515 Merge pull request #28906 from TronPaul/configparser-serializer 
Configparser serializer
 2015-11-18 19:42:52 -07:00
Justin Findlay
0c0bce3ea6 cache runner test: add new unit tests 2015-11-18 16:33:46 -07:00
Mike Place
b386bfa59d Merge pull request #28952 from rominf/hg_status_multiple_repos 
[modules/hg] hg.status: multiple repositories
 2015-11-18 11:35:29 -07:00
Colton Myers
d76d62877d Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/git.py
    salt/renderers/gpg.py
    salt/utils/__init__.py
 2015-11-17 16:24:43 -07:00
Mark McGuire
f0a60b33e2 Use changes in #28926 2015-11-17 10:54:19 -06:00
Mark McGuire
be2751885d Merge remote-tracking branch 'origin/develop' into configparser-serializer 2015-11-17 10:26:09 -06:00
Roman Inflianskas
ded2d46663 [modules/hg] hg.status: multiple repositories 2015-11-17 19:05:57 +03:00
Mike Place
1e9214f4e4 Merge pull request #28787 from chrigl/fix-28784 
closes #28784
 2015-11-17 08:54:04 -07:00
Mike Place
5b680c938a Merge pull request #28950 from DSRCompany/pr/28812_which 
PR 28812 which test fix
 2015-11-17 08:32:16 -07:00
Dmitry Kuzmenko
18571000c5 Fix which test in PR#28812 2015-11-17 11:29:41 +03:00
Christoph Glaubitz
8639e3e9c3 closes #28784 
In fact this test will fail on the current code, but that is like
intended. This tests the fix of #28783, which was introduced in 2015.5.
 2015-11-16 20:30:37 +01:00
Mike Place
27b917b623 Adjust tests for new loader spec 2015-11-16 12:23:05 -07:00
Justin Findlay
5ce61abf57 rewrite GPG unit tests 2015-11-16 09:36:29 -07:00
Mark McGuire
4324189658 add deserializer test, fix deserialization 2015-11-15 14:14:42 -06:00
Mark McGuire
53dd9ae138 Add configparser serializer 
* move "python" serializer to serializers
* make salt.states.file.serializer load serializers from salt.serializers
 2015-11-15 14:04:27 -06:00
Justin Findlay
e32a9aab85 rh_service._chkconfig_is_enabled unit tests 2015-11-13 23:38:40 -07:00
Colton Myers
efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/vmware.py
    salt/grains/chronos.py
    salt/grains/marathon.py
    salt/loader.py
    salt/modules/chronos.py
    salt/modules/marathon.py
    salt/proxy/chronos.py
    salt/proxy/marathon.py
    salt/state.py
    salt/states/chronos_job.py
    salt/states/marathon_app.py
    salt/states/user.py
    salt/utils/schedule.py
 2015-11-13 15:18:45 -07:00
Todd Tomkinson
ba94878f45 marathon and chronos proxy minions 2015-11-12 10:03:38 -07:00
C. R. Oldham
2ad01fe7a2 Merge pull request #28778 from toddtomkinson/marathon_chronos_proxy_minions 
marathon and chronos proxy minions
 2015-11-12 08:07:21 -07:00
twangboy
c0cf33332c Fixed some Lint... 2015-11-11 14:27:06 -07:00
Justin Findlay
bc7e0cfe64 add file.symlink unit tests 2015-11-11 13:37:47 -07:00
Justin Findlay
9381dc7215 orthogonalize file.symlink unit tests 2015-11-11 13:37:18 -07:00
rallytime
e2b0fee57e Don't change perms list, only existing perms should be a dictionary. 
Refs #28269
 2015-11-11 12:31:51 -07:00
rallytime
7601647d69 Revert "rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list." 
This reverts commit 07482211eb.
 2015-11-11 12:23:17 -07:00
Todd Tomkinson
f6ccc0e250 marathon and chronos proxy minions 2015-11-11 10:51:28 -07:00
rallytime
07482211eb rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list. 
Refs #28269
 2015-11-11 09:45:35 -07:00
Scott Walton
e9b84b35b4 Resolved merge conflict with upstream. 2015-11-11 16:38:31 +00:00
Scott Walton
e46d31d446 Amended the tests to remove the tab-check and still keep #28608 fixed 2015-11-11 16:32:56 +00:00
Colton Myers
87365212b4 Merge pull request #28723 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-11-10 11:26:29 -07:00
Mike Place
590f503fb8 Merge pull request #28748 from tinyclues/cors_url_with_arguments 
[Saltnado] - Add support for CORS preflight request for parametrized urls
 2015-11-10 11:24:30 -07:00
FELD Boris
049815fb34 Add support for cors preflight request for parametrized urls 
The implementation was broken for jobs and minions handlers
 2015-11-10 18:37:03 +01:00
Colton Myers
8a23181dd7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/boto_secgroup.py
    salt/modules/rabbitmq.py
    salt/modules/win_system.py
    salt/modules/yumpkg.py
    salt/states/mount.py
 2015-11-09 17:05:43 -07:00
Colton Myers
c90431eddc Rip out unit test that doesn't apply anymore 
We now use -q with the command so we don't have to test our ability to
strip "Listing vhosts" out of the test
 2015-11-09 15:22:01 -07:00
Mike Place
759242a6ec Merge pull request #28671 from jfindlay/multi_mod 
implement multiple modules in the kmod state
 2015-11-07 19:11:52 -07:00
Justin Findlay
8524281f4e update kmod exec and state module unit tests 2015-11-07 16:04:23 -07:00
Steve Hajducko
455f40b0d2 Refactor etcd modules 
The etcd modules were using bits and pieces of python-etcd directly and
were using outdated exceptions to catch errors.  These errors were
causing issues when trying to use etcd modules for logic.

A summary of changes
    - Most of the 'work' is now done in etcd_util
    - Removed import of python-etcd from states/etcd_mod and the
      returner
    - Added new tests for etcd_util
    - Put in proper exceptions and catches for python-etcd
    - Added support for ValueError catching.  python-etcd doesn't
      support python 2.6 and raises ValueError when trying to format
      exceptions
    - Added watch function to etcd execution module
    - Added autospec to unit tests so hopefully less brittle
    - Added TTL and directory features to the set function

*BACKWARDS INCOMPATIBLE CHANGES*

All interfaces are still backwards incompatible.  However, the returns
from several of the etcd util functions have been changed.  The old
returns presented issues with certain test cases.  For instance, a
failed 'get' returned '', but a key with no value will also return ''.

The same issues occured with the 'ls', 'tree' and 'set' functions.  Trying to
ls a blank directory returned the same result as a failed ls of a
non-existent key.
 2015-11-06 16:29:50 -08:00
Scott Walton
540305dc99 Added test and fix for #28608. 2015-11-06 09:06:07 +00:00
Mike Place
81396927f8 Merge pull request #28605 from zigarn/a2xxconf 
Improvements on Debian-style apache utilities a2(en|dis)(mode|site|conf)
 2015-11-05 15:18:28 -07:00
Nicole Thomas
b5a89927f0 Merge pull request #28594 from rallytime/merge-develop 
Merge branch '2015.8' into develop
 2015-11-05 14:47:42 -07:00
Alexandre Garnier
f505b51ab1 Add module and state wrappers on a2enconf/a2disconf 2015-11-05 19:07:14 +01:00
rallytime
62d688d720 Fix mock patch module name 2015-11-05 10:45:30 -07:00
rallytime
3bcd068f6a Update cloud vmware unittests to utilize the salt.utils.vmware.py file 2015-11-05 10:02:05 -07:00
Alexandre Garnier
2e6cf66d80 Add apache_site state (like apache_module) 
Allow to enable/disable Debian-style sites with `a2ensite`/`a2dissite`.
 2015-11-05 17:52:42 +01:00
Alexandre Garnier
39e1e6448b Simplify deb_apache.check_mod_enabled 
There is no 'default' with '000-' prefix for modules.
(Looks like a copy/paste from `check_site_enabled`)
 2015-11-05 17:52:42 +01:00
Mike Place
5293150d25 Fix tests 2015-11-05 08:29:55 -07:00
Jiri Kotlin
eb19140cc5 INI test compliancy - modified ini_manage_test.py 2015-11-05 13:49:05 +00:00
rallytime
d31b0d1573 Merge branch '2015.8' into develop 2015-11-04 15:40:03 -07:00
Mike Place
7ca7ed4b37 Merge pull request #28579 from jfindlay/virt_ret 
fix __virtual__ returns: tls,uptime mods
 2015-11-04 15:00:02 -07:00
Justin Findlay
333c132378 fix __virtual__ returns: tls,uptime mods 2015-11-04 13:10:38 -07:00
Mike Place
ec924e8410 Merge pull request #28560 from bdrung/2015.8 
Fix various typos
 2015-11-04 08:06:36 -07:00
Benjamin Drung
470e82f17f Fix typo an dictionnary -> dictionary 2015-11-04 11:06:09 +01:00
Justin Findlay
11a9a5868f simplify timezone module unit test mocks 2015-11-03 19:37:54 -07:00
Justin Findlay
476b651c94 update timezone module unit tests for timedatectl 2015-11-03 19:34:01 -07:00
Colton Myers
422c641233 Remove test failing because of mocks -- it's deprecated anyway 2015-11-02 19:42:01 -07:00
Colton Myers
32969b2408 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    salt/cloud/clouds/digital_ocean.py
    salt/cloud/clouds/linode.py
    salt/loader.py
    salt/modules/blockdev.py
    salt/modules/boto_route53.py
    salt/modules/boto_vpc.py
    salt/modules/bsd_shadow.py
    salt/modules/file.py
    salt/modules/rabbitmq.py
    salt/modules/schedule.py
    salt/modules/win_network.py
    salt/runners/state.py
    salt/spm/__init__.py
    tests/unit/modules/blockdev_test.py
 2015-11-02 18:19:01 -07:00
twangboy
7d39091c91 Fixed some more lint 2015-11-02 16:51:16 -07:00
twangboy
3dbd62af2c Fixed some tests... hopefully 2015-11-02 16:13:07 -07:00
Colton Myers
238411c8ce Merge pull request #28464 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-11-02 13:18:21 -07:00
Colton Myers
6f6e687cb4 Mock master_uri for even tests 2015-11-02 12:15:53 -07:00
Mike Place
da62fdc1e7 Merge pull request #28498 from rominf/postgres-quotes 
[modules/postgres] quote identifiers in SQL
 2015-11-02 12:11:57 -07:00
Roman Inflianskas
0184ecaba7 [modules/postgres] fix tests 2015-11-02 20:53:18 +03:00
Mike Place
7c81188f67 Merge pull request #28421 from rominf/service_run 
[modules/service] Add run function to run services with custom arguments
 2015-11-02 10:43:54 -07:00
Christophe Drevet-Droguet
eee2318873 grains state: allow deleting grain with 'False' value 
and destroy a grain previously set to None, with destructive=True:

The f46722aaeb commit, from Bruno Binet <bruno.binet@gmail.com> was
effectively reverted during my work on nested and complex values support.

This commit get it back, plus the ability to destroy a existing grain that
was previously set to None, plus tests for these.
 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
576252da05 grains state: list_present, list_absent support nested grain 
... and custom delimiter
 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
62a1f37d86 grains state: nested support for grains.append 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
c19cff517a grains state: more tests 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
cc844e4a2c grains state tests: test the grain file content as well 
It may be overkill, but I'm nervous about this change and
I don't want to mess with the grain file of a lot of people
 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
1c5cd4c82d grains state: changes comment more accurate 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
c63913e602 grains module: simpler comment for already set key 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
6b8c245b87 grains state: new tests for nested grains 2015-11-02 09:31:43 -05:00
Andreas Lutro
a772ce330a fix tests 2015-11-02 10:50:51 +01:00
Daniel Hobley
e0060ac5e9 Replaced user with runas for cmd.run 2015-11-01 09:35:58 +01:00
Daniel Hobley
b6e27932c8 Added the ability to run adb as a specific user 2015-10-31 23:09:08 +01:00
Daniel Hobley
3d1552e9b9 Fixed a bug in adb beacon when the deamon starts up 2015-10-31 21:56:59 +01:00
Daniel Hobley
3fe0a7764b Added beacon for adb devices 
With this beacon you are able to get events when a device goes offline or goes missing from the minion
 2015-10-31 21:06:58 +01:00
Roman Inflianskas
5d0ef71b3d [tests/unit][modules/service] add service.run, fix service.* 2015-10-31 14:42:05 +03:00
Roman Inflianskas
6190d6699e [modules/service] add service.run 2015-10-31 14:41:58 +03:00
Roman Inflianskas
233b9163a5 [tests/unit][modules/hg] add hg.status 2015-10-31 14:30:08 +03:00
justinta89
7ca79f1f7b Skipped wipefs test if wipefs does not exist on OS 2015-10-30 15:04:33 -06:00
Justin Findlay
9ec72ca724 fix file state unit tests for win symlink feature 2015-10-29 13:50:38 -06:00
Mike Place
558be2e033 Merge pull request #28352 from rominf/check_or_die_to_virtual 
Replace all check_or_die to __virtual__
 2015-10-29 13:41:33 -06:00
Daniel Hobley
124c758587 Lint fixes 2015-10-29 15:53:31 +01:00
Daniel Hobley
8af9246c4c Hostname is the same even if the characters are in different cases 
- Windows likes to give you back a hostname in uppercase while you might want to specify it in lower case, this commit allows you to do that
 2015-10-29 13:36:18 +01:00
Daniel Hobley
72db9026e1 Lint fixes 2015-10-29 12:02:14 +01:00
Daniel Hobley
a78aab3255 Added the ability to change the "hostname" on windows minions 2015-10-29 11:39:22 +01:00
Roman Inflianskas
e299fc3ff2 Replace check_or_die functions to __virtual__ 2015-10-29 10:59:58 +03:00
Matthias Erll
042314246f Unit test for merging included pillars. 2015-10-28 21:45:26 +01:00
Matthias Erll
2f3f2d6f29 Consider each pillar match only once. 2015-10-28 13:56:44 +01:00
Erik Johnson
a44c8d8dab Merge pull request #28270 from rallytime/refactor_rabbitmq_plugin_state 
Refactor RabbitMQ Plugin State to correctly use test=true and format errors
 2015-10-27 11:18:34 -06:00
Erik Johnson
4efd07eba5 Merge pull request #28269 from rallytime/refactor_rabbitmq_user_state 
Refactor rabbitmq_user state to use test=True correctly
 2015-10-27 11:17:42 -06:00
rallytime
9e40c3a6a6 Fine tuning and fix tests 2015-10-27 10:30:00 -04:00
rallytime
65fdb50246 Get the list indice to compart before looking at keys 2015-10-26 14:20:27 -04:00
rallytime
aebbcb88ea Pylint fix 2015-10-26 14:10:34 -04:00
rallytime
19b8b868a3 Clean-up/fixes to rabbitmq_user state and test adjustments 2015-10-26 13:48:50 -04:00
Mike Place
5b7cc65b03 Merge pull request #27843 from jacksontj/concurrent 
RequestContext
 2015-10-26 09:00:54 -06:00
rallytime
95defb87c5 Add test for availability_zone check to boto_vpc_tests 2015-10-26 10:15:29 -04:00
Mike Place
abe3003aed Merge pull request #28204 from DSRCompany/issues/23157_rename_client_acl 
Deprecate client_acl with publisher_acl (rename)
 2015-10-26 08:04:56 -06:00
Justin Findlay
0dc72135de update blockdev exec and state module unit tests 2015-10-23 18:12:43 -06:00
Thomas Jackson
ff1ac70cd5 Python3 compat for context_test 2015-10-23 11:30:21 -07:00
Thomas Jackson
718cf64817 Pylint cleanup 2015-10-23 08:53:44 -07:00
justinta89
835a11b6be Fixed win_firewall_test 2015-10-23 09:53:03 -06:00
Thomas Jackson
256a0e2af8 Rename and consolidate NUM_JOBs into a single class-wide variable 2015-10-23 08:43:46 -07:00
Thomas Jackson
3662465471 pylint cleanup 2015-10-23 08:40:56 -07:00
Thomas Jackson
408af9d419 Add Coroutine tests for the ContextDict 2015-10-23 08:31:37 -07:00
Dmitry Kuzmenko
022c8bdf7e Fixed unit test 2015-10-23 17:26:15 +03:00
Dmitry Kuzmenko
7a5204ef02 Deprecate client_acl with publisher_acl (rename) 
Keeping client_acl support
 2015-10-23 11:59:40 +03:00
Thomas Jackson
6838a9534f Initial addition of ContextDict 
Inspired by #23373

The basic issue we ran into is that the loader is injecting globals directly into the global namespace. This means that these injected values are not thread or coroutine safe-- meaning we can never do more than one thing at a time. Instead of multiprocessing everything to death-- we can simply use a stack_context to nicely handle this down in the core. As far as the module authors/users are concerned nothing has changed-- but the storage behind the scenes is now per-JID. This same set of classes can easily be used to store additional data (next candidates are reactors, master MWorker tasks, etc.).
 2015-10-22 18:41:27 -07:00
justinta89
a74dbad74a Started fixing win_firewall_test 2015-10-22 13:12:31 -06:00
twangboy
69c32a663e Fixed some lint 2015-10-22 11:24:38 -06:00
twangboy
638dec5027 Fixed some tests... let's see if they're really are 2015-10-22 11:05:22 -06:00
Colton Myers
c89d63650e Quiet pylint 2015-10-21 15:10:52 -06:00
Ronald van Zantvoort
46bf6d4fa3 Update file.serialize test for Python serialized 
pprint.pformat seems non-reversible, so just add the newline there as well
 2015-10-21 17:12:53 +02:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
Marek Skrobacki
f735792846 s6 service module 2015-10-20 11:43:09 +01:00
Mike Place
1db6406bef Merge pull request #28013 from rallytime/bp-27891 
Back-port #27891 to 2015.8
 2015-10-19 06:57:51 -06:00
rallytime
9ea33bf0e4 Pylint fixes 2015-10-16 07:22:46 -06:00
Domingo Kiser
4af5b5c33f introduce recurse_list pillar_source_merging_strategy 2015-10-16 05:24:40 -06:00
justinta89
cd67843bd0 Fix schedule_test failure 2015-10-15 14:49:26 -06:00
Colton Myers
153087a7b4 Merge pull request #26945 from dr4Ke/feature_state_grains_support_nested_and_dict 
Feature state grains support nested and dict
 2015-10-15 14:25:44 -06:00
Erik Johnson
2d0b16559e Merge pull request #27676 from ticosax/no-more-arg-to-docker-start 
[dockerng] WIP No more runtime args passed to docker.start()
 2015-10-14 08:38:41 -05:00
Colton Myers
6537da77fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/grains/core.py
    salt/loader.py
    salt/minion.py
    salt/modules/dockerng.py
    salt/modules/rest_package.py
    salt/modules/ssh.py
    salt/modules/state.py
    salt/modules/timezone.py
    salt/modules/zypper.py
    salt/runners/state.py
    salt/state.py
    salt/states/virtualenv_mod.py
    salt/utils/cloud.py
 2015-10-13 17:27:48 -06:00
Colton Myers
722327ee5f Merge pull request #27885 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-10-13 16:44:20 -06:00
Colton Myers
5ecd5615f2 Remove failing heavily-mocked test 2015-10-13 15:08:40 -06:00
Nicolas Delaby
a1d0ba392f fixup! Do not pass any argument to docker.start 2015-10-13 20:53:11 +02:00
Nicolas Delaby
65c8762e1f Do not pass any argument to docker.start 
docker.create is responsible to manage all of them, since docker API 1.16
 2015-10-13 19:39:32 +02:00
Mike Place
59e93ddde6 Merge pull request #27521 from terminalmage/zh107 
Remove raw string formatting in execution modules
 2015-10-13 10:57:08 -06:00
Mike Place
36f05fb526 Merge pull request #27882 from twangboy/win_task_module 
Created win_task.py module
 2015-10-13 10:54:13 -06:00
Erik Johnson
50cb56d7f6 Update raet_publish unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
7de02e95e9 Update darwin_pkgutil unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
ca9c478fa7 Update gem unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
71d57248d7 Update postgres unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
aef6c39c04 Update rvm unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
0210ef4434 Update mac_user unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
76ce6949d7 Update at unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
d2ad1d7892 Update rsync unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
362a91d42b Remove rsync.config test since mock_open can't handle iterative reads 2015-10-13 10:52:59 -05:00
Erik Johnson
b1c60121bd Update virtualenv unit tests to reflect changes in execution module 2015-10-13 10:52:58 -05:00
Erik Johnson
a5d6a3e768 Update pw_user unit tests to reflect changes in execution module 2015-10-13 10:52:58 -05:00
Erik Johnson
93815e6e39 remove rbenv test that doesn't really test anything 2015-10-13 10:52:58 -05:00
Mike Place
6d46a38d5d Whitespace lint 
Refs #27891
 2015-10-13 09:15:12 -06:00
Mike Place
a158cd50e6 Merge pull request #27746 from alprs/fix-timedatectl_failure 
timezone module: handle timedatectl errors
 2015-10-13 08:55:27 -06:00
Mike Place
9dc19caa79 Merge pull request #27816 from alprs/fix-reboot_delay 
Make system.reboot use `shutdown -r` when available
 2015-10-13 08:52:06 -06:00
Domingo Kiser
a8adaa8f9e introduce recurse_list pillar_source_merging_strategy 2015-10-12 21:59:39 -07:00
twangboy
14e060ed9c Fixed some tests 2015-10-12 16:54:10 -06:00
Andreas Lutro
04ef51e524 make system.reboot use shutdown -r when available 
see issue #27710
 2015-10-12 21:54:42 +02:00
Justin Findlay
bc0f167850 update timezone mod unit tests for errors 2015-10-12 11:39:03 -06:00
C. R. Oldham
b049377cbe Remove rest_sample_test, it wasn't testing anything 2015-10-12 08:34:36 -06:00
Richard Hansen
9aa19575fa new ldap state module 2015-10-09 17:47:56 -04:00
Eren Güven
2caf1d21d6 fix test 2015-10-08 14:57:33 +02:00
Colton Myers
69d960f8e6 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/topics/ssh/index.rst
    salt/modules/boto_secgroup.py
    salt/modules/dockerng.py
    salt/states/archive.py
    salt/states/boto_elb.py
    salt/states/boto_secgroup.py
    tests/unit/modules/schedule_test.py
 2015-10-07 13:11:48 -06:00
Nicolas Delaby
821ed72f37 pass filters argument to dockerng.ps 2015-10-07 15:06:16 +02:00
Nicole Thomas
1b9e814c13 Merge pull request #27718 from rallytime/merge-27635-and-27552 
Merge #27635 and #27552
 2015-10-06 12:40:24 -06:00
Nicolas Delaby
edf625c8b4 Add support of labels parameter for dockerng 2015-10-06 13:18:05 +02:00
Stephen Woodrow
509ded1bd0 Fix some tests. 2015-10-05 20:57:17 -07:00
Colton Myers
77516912fa Merge pull request #27630 from ticosax/include-container-id-docker-mine 
Expose container_id in mine.get_docker
 2015-10-05 15:56:53 -06:00
Colton Myers
7a4291008e Merge pull request #27689 from rallytime/fix-tests-27448 
Merge #27448 with test fixes
 2015-10-05 15:17:41 -06:00
rallytime
05a506ec9f Use correct comment in test 2015-10-05 14:02:13 -06:00
rallytime
8296fefb31 Merge #27448 with test fixes 2015-10-05 12:33:03 -06:00
Ethan Moore
c7aea90546 Adding tags to OrderedDict in test module 
Adding SaltInvocationError import
 2015-10-02 20:10:07 +00:00
Nicolas Delaby
9e56a7e9db Expose container_id in mine.get_docker 
Because sometimes we should be able to perform additional introspection.
 2015-10-02 21:30:33 +02:00
Nicole Thomas
e103f53b4f Merge pull request #27485 from lyft/boto-asg-scheduled-actions 
Add scheduled actions (like scaleup/scaledown actions) to boto_asg
 2015-10-01 09:18:19 -06:00
Ryan Lane
714a93900b Patch config.option 2015-09-30 10:04:10 -07:00
Mike Place
fd11e0cd95 Merge pull request #27522 from twangboy/fix_26629 
Removed dependency on powershell to restart salt-minion
 2015-09-30 10:19:29 -06:00
C. R. Oldham
eb76531e96 Merge pull request #27550 from rallytime/cloud-logging 
[2015.8] Clean up salt-cloud logging and make it more useful
 2015-09-30 09:48:53 -06:00
Nicole Thomas
e5de9409c2 Merge pull request #27525 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-29 21:38:22 -06:00
rallytime
78c85fbb31 Add unit tests for new recursive function 2015-09-29 21:25:47 -06:00
Colton Myers
1f3eb1c526 Remove useless mocked unit test 2015-09-29 18:23:46 -06:00
Colton Myers
41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/rest_service.py
    salt/states/dockerng.py
    salt/utils/cloud.py
 2015-09-29 18:13:33 -06:00
twangboy
163c54505d Fixed tests... hopefully 2015-09-29 15:28:23 -06:00
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
 2015-09-29 14:56:41 -06:00
Nicole Thomas
e974a3c8aa Merge pull request #27510 from rallytime/ryan-lane-test-fix 
Merge #27475 with test fixes
 2015-09-29 12:34:32 -06:00
rallytime
cae2c4e715 Syntax fix 2015-09-29 10:02:16 -06:00
rallytime
458547ba03 Fix test failures for boto __state__ changes 2015-09-29 09:55:44 -06:00
Mike Place
d85b0cbd69 Merge pull request #27451 from ticosax/dockerng-host-config-support 
[dockerng] Enforce usage of host_config and require docker-py>=1.4.0
 2015-09-29 09:51:28 -06:00
Nicolas Delaby
fadd9bd43e Add test to check we don't call inspect_image on absent images. 2015-09-29 15:53:29 +02:00
Nicolas Delaby
b184faa55b Enforce usage of host_config and require docker-py>=1.4.0 2015-09-28 23:24:57 +02:00
Mike Place
0bc37c0d41 Fix test 2015-09-28 12:57:22 -06:00
Nicolas Delaby
a1ed6cda56 Skip test if docker-py is not installed 2015-09-28 19:53:10 +02:00
Mike Place
74095b6b22 Lint 2015-09-28 11:48:51 -06:00
Nicolas Delaby
cc8471bd1b dockerpy expect only command argument not cmd 2015-09-28 10:08:40 -05:00
justinta89
fd0dedeb99 Skipping Async tests 
Skipping the transport async tests until we can devote more time to fixing the
test failures associated with them.
 2015-09-24 13:41:58 -06:00
Daniel Hobley
f972c39333 Lint fixes 2015-09-24 12:41:56 +02:00
Daniel Hobley
40db871e2b Added the ability to trim the returned files from an unzip 
- This reduces log spamming when you unzip thousands of files, it defaults to off
 2015-09-24 11:43:21 +02:00
Mike Place
23fcc9e348 Merge pull request #27248 from tinyclues/better_cors_headers 
[Saltnado] - The CORS implementation was a bit naive about headers allowance.
 2015-09-23 08:50:06 -06:00
Mike Place
3933eed307 Merge pull request #27249 from tinyclues/login_support_more_content_type 
[Saltnado] - Add the support of login payload in JSON and YAML.
 2015-09-23 08:49:42 -06:00
Mike Place
f63f4d8c43 Merge pull request #27289 from terminalmage/encrypted-cli-pillar 
Feature add: Encrypted CLI pillar data
 2015-09-22 10:34:13 -06:00
Erik Johnson
bacc76c355 Update mocked objects for state module tests 
Added the new pillar_enc value
 2015-09-22 08:25:51 -05:00
FELD Boris
6417161fd7 The CORS implementation was a bit naive about headers allowance. 
A preflight request send the list of headers of the final request
in a special header ```Access-Control-Request-Headers```.
The server must returns the list of allowed header in the special header
```Access-Control-Allow-Headers```.

This PR just returns the whole list of headers but may allow filtering of some
of them quite easily. I'm not sure to see how filtering how headers may
impact security, if anyone has some leads.
 2015-09-18 23:24:43 +02:00
FELD Boris
a4fd1e75c5 Add the support of login payload in JSON and YAML. 
Login endpoint supported only application/x-www-form-urlencoded which may
be an useless limitation. This PR add support for more content-type,
JSON and YAML and every content-type supported by saltnado in general
as it uses the same deserialisation method than the lowstate deserialisation.
 2015-09-18 19:16:47 +02:00
Colton Myers
9864d9e0fa Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/index.rst
    doc/topics/releases/boron.rst
    salt/cli/daemons.py
    salt/cli/salt.py
    salt/modules/jboss7.py
    salt/states/file.py
 2015-09-18 11:03:37 -06:00
Colton Myers
9ddc88c6ba Merge pull request #27198 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-17 15:33:15 -06:00
Colton Myers
1cbfa06591 Remove heavily-mocked failing test 2015-09-17 14:38:05 -06:00
Colton Myers
26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
 2015-09-17 11:10:37 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
FELD Boris
5e9c3c7d96 Improve support of Accept header in saltnado. 
It currently supports 'simple' values like application/json, but Accept header
could also include more than one value with parameters
See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1.
For example:

```application/json, text/javascript, */*; q=0.01```

This PR add support for multiple media_range in Accept header, support parsing
of parameter (like q=0.01) but discard them and finally iterate on
media_range and take the first compatible.

A more complete implementation may fully supports the RFC and support
q parameter and specific order of priority to find the most compatible
Content-Type but I don't think it's worth the pain.

If we want a better implementation, werkzeug has actually an implementation
http://werkzeug.pocoo.org/docs/0.10/datastructures/#werkzeug.datastructures.Accept.best_match.
 2015-09-17 00:48:34 +02:00
twangboy
7992b7e20a Fixed some tests... hopefully... 2015-09-15 16:27:47 -06:00
FELD Boris
ef3b7ddc2d Fix lints 2015-09-15 20:29:18 +02:00
FELD Boris
b13f66ee4b Add support for CORS in saltnado. 
Add support for CORS and tests in RPC salt-api. The code was inspired by
https://github.com/globocom/tornado-cors.

Also add support for CORS in websocket. By adding some tests, I made
a small refactoring to make the websocket handler more easily testable.

Some documentation about CORS could be found here
https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
for reference.
 2015-09-15 18:52:44 +02:00
Christophe Drevet-Droguet
8553c44cea grains state: allow deleting grain with 'False' value 
and destroy a grain previously set to None, with destructive=True:

The f46722aaeb commit, from Bruno Binet <bruno.binet@gmail.com> was
effectively reverted during my work on nested and complex values support.

This commit get it back, plus the ability to destroy a existing grain that
was previously set to None, plus tests for these.
 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
484853412b grains state: list_present, list_absent support nested grain 
... and custom delimiter
 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
a02f125faa grains state: nested support for grains.append 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
394586f759 grains state: more tests 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
098af32354 grains state tests: test the grain file content as well 
It may be overkill, but I'm nervous about this change and
I don't want to mess with the grain file of a lot of people
 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
250bc8d308 grains state: changes comment more accurate 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
557e642ddf grains module: simpler comment for already set key 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
b0c9d23cef grains state: new tests for nested grains 2015-09-15 17:49:49 +02:00
Justin Findlay
440855b182 Merge pull request #27033 from jfindlay/n0ne 
Merge #27019
 2015-09-15 01:32:17 -06:00
Colton Myers
ab519fb5ff Remove heavily-mocked unit tests 2015-09-14 17:00:02 -06:00
Justin Findlay
3334b9d548 fix comment and unit test for reg state 2015-09-14 16:04:09 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
Mike Place
a87a62c5b6 Merge pull request #26857 from bradthurber/add_jboss_domain_mode_to_jboss7_modules 
add jboss domain mode to jboss7 python modules
 2015-09-14 13:40:26 -06:00
Mike Place
b13b6b912a Merge pull request #26984 from tinyclues/26505_improve_content_type_support 
[NetAPI] SaltNado - Improve support for Content-Type parsing. Ref #26505
 2015-09-14 13:02:28 -06:00
Brad Thurber
5d4798012a more test updates 2015-09-14 13:05:07 -04:00
Pedro Algarvio
fcb7138efa Make sure spm tests are picked up by runtests. 
Lists in py2 don't have the clear method
 2015-09-14 17:54:51 +01:00
Brad Thurber
872aabf7fa update more tests 2015-09-14 11:55:42 -04:00
Brad Thurber
b1ceb221a0 more test updates. It wouldn't surprise me if these changes expose other failing tests. 2015-09-14 10:36:40 -04:00
Brad Thurber
72235f61ce clean up lint and add profile to tests 2015-09-14 09:03:30 -04:00
rallytime
a0de117a0f Merge branch '2015.8' into develop 
Conflicts:
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/config/__init__.py
 2015-09-11 09:33:21 -06:00
Justin Findlay
391a09d5ac update reg state unit tests 2015-09-10 16:16:15 -06:00
Justin Findlay
b36a7107b2 update win_path exec module unit tests 2015-09-10 15:17:46 -06:00
Justin Findlay
801f2eadb5 Merge pull request #26874 from evverx/use-localectl-on-jessie-and-vivid 
Use localectl for locale setting/getting on Debian if available
 2015-09-10 13:30:05 -06:00
Erik Johnson
30a4915762 Update tests to reflect changes to timezone module 2015-09-10 11:05:38 -05:00
Seth House
6d22514934 Rename the rest_cherrypy tests to conform to our convention 
Previously they conformed to the default unittest2 convention.
 2015-09-09 10:39:34 -06:00
FELD Boris
23c7b4847c Improve support for Content-Type parsing. Ref #26505 
It currently supports 'simple' values like application/json, but Content-Type
header could also includes parameter. See RFC http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.17.

When sending JSON from a browser for example, the Content-Type is
`application/json; charset=utf-8` and salt-api failed to detect JSON content.

The proposition is to use cgi.parse_header method (https://docs.python.org/2.7/library/cgi.html?highlight=cgi#cgi.parse_header)
to correctly parse the Content-Type value but ignore parameters, JSON should
always be UTF-8 but I don't know about other supported Content-Type.
 2015-09-09 16:41:29 +02:00
Seth House
2aa3da8911 Rename the rest_cherrypy tests to conform to our convention 
Previously they conformed to the default unittest2 convention.
 2015-09-08 15:40:06 -06:00
Pedro Algarvio
10a9189d83 Merge remote-tracking branch 'upstream/2015.8' into hotfix/merge-forward-develop 2015-09-06 12:42:58 +01:00
Mike Place
a33569a8be Merge pull request #26910 from s0undt3ch/hotfix/26848-event-backwards-compat 
Sometimes the event system is just too fast
 2015-09-04 09:00:39 -06:00
Pedro Algarvio
503e050a75 Sometimes the event system is just too fast 2015-09-04 15:52:06 +01:00
Evgeny Vereshchagin
8f77b743cd Use localectl for locale setting on Debian if available 2015-09-04 04:06:55 +03:00
Mike Place
1d5fd71fa3 Merge pull request #26880 from s0undt3ch/hotfix/26848-event-backwards-compat 
Restore backwards compatibility to `salt.utils.event`
 2015-09-03 17:04:45 -06:00
Michael Steed
d6e64ec1a7 lint 2015-09-03 14:30:58 -06:00
Michael Steed
a42651fb38 spm updates 
- add hash_file() routine to salt.spm.pkgfiles.local
- use os.path.exists() instead of pkgfiles.path.exists() in
  _local_install()
 2015-09-03 14:28:21 -06:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
Mike Place
57b78d369a Make the testing ioloop the current one 
Otherwise, loops from previous intefere and cause stacktraces on ioloop init
 2015-09-03 13:28:28 -06:00
Pedro Algarvio
2f40387290 Add test_event_single_wait_0_no_block_False test case 2015-09-03 19:54:57 +01:00
Pedro Algarvio
ae9c6c9cff Workaround wait=0 meaning a blocking call when non blocking is required 2015-09-03 18:06:43 +01:00
Pedro Algarvio
dc0fec3be3 Restore backwards compatibility to salt.utils.event 
Fixes #26848
Refs #26000
 2015-09-03 11:11:58 +01:00
Joe Julian
6108ec4280 Gated dbus for os families that use it 
Gated the dbus include for os families that are currently using it
within this module at this time.

Renamed some defs to more appropriately express their function.
 2015-09-01 15:19:49 -07:00
Colton Myers
278e8dda5b Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/gce.py
 2015-09-01 15:15:13 -06:00
Mike Place
3c4523237f Merge pull request #26810 from Unity-Technologies/feature/global-environ-win 
Added the ability to set permanent environment variables on windows
 2015-09-01 11:42:06 -06:00
Daniel Hobley
1c8e6e067f Fixed lint issues 2015-09-01 13:56:43 +02:00
Daniel Hobley
fc724158de Added the ability to set permanent environment variables on windows 2015-08-31 13:47:29 +02:00
Erik Johnson
d30eaee653 Add http basic auth tests 2015-08-29 21:14:20 -05:00
Erik Johnson
a605607709 Remove git unit tests, moving them to salt.utils.url tests 2015-08-29 21:14:20 -05:00
Colton Myers
1bbe45538e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/__init__.py
    salt/modules/smartos_vmadm.py
    salt/utils/s3.py
    setup.py
 2015-08-28 16:44:08 -06:00
Colton Myers
b509cdfa4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/linode.py
    salt/grains/ssds.py
    salt/modules/git.py
    salt/modules/pip.py
    tests/integration/cloud/providers/gogrid.py
    tests/integration/cloud/providers/linode.py
    tests/integration/cloud/providers/msazure.py
    tests/integration/cloud/providers/rackspace.py
    tests/unit/modules/pip_test.py
 2015-08-28 16:33:54 -06:00
Erik Johnson
b45f37a467 Add http basic auth tests 2015-08-28 15:43:24 -05:00
Erik Johnson
1ed42ea4fd Remove git unit tests, moving them to salt.utils.url tests 2015-08-28 15:41:33 -05:00
Colton Myers
964a47c643 Fix tests 2015-08-28 13:50:31 -06:00
Colton Myers
9e88672e5a Merge pull request #26683 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-27 15:28:14 -06:00
Colton Myers
5628702dd2 lint 2015-08-27 14:41:31 -06:00
Mike Place
cfc61c6629 Merge pull request #26688 from richardhansen/states.host.only 
new salt.states.host.only() function to limit names associated with an IP
 2015-08-27 14:23:00 -06:00
Colton Myers
4f441179aa Test fixes 2015-08-27 14:11:34 -06:00
Colton Myers
e9674b541f Another file_test fix 2015-08-27 14:08:14 -06:00
Mike Place
cf487cf0f5 Merge pull request #26709 from rallytime/fix-14612 
Ensure VM name is valid before trying to create Linode VM
 2015-08-27 14:07:49 -06:00
Colton Myers
c3a6280f8c Merge pull request #26617 from terminalmage/issue9592 
Fix Windows failures in pip module due to raw string formatting
 2015-08-27 13:24:53 -06:00
rallytime
a3ac8e7008 Whitespace fix 2015-08-27 11:41:14 -06:00
rallytime
9a4228d906 Added unit tests for new _validate_name function and adjusted regex 2015-08-27 11:17:28 -06:00
Gareth J. Greenaway
c11cf22abe fixing ipset unit tests based on changes. Adding additional tests for when ip set type is hash:net 2015-08-27 08:28:23 -07:00
Erik Johnson
96c559d63e tests/unit/states/eselect_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
2d51f3d25b tests/unit/states/dockerng_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
9fee076477 tests/unit/pydsl_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
106f386df3 tests/unit/modules/cron_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Colton Myers
ca3f40b94e More test fixing 2015-08-26 19:32:31 -06:00
Richard Hansen
7457f2302d salt.states.host.only: new function to limit to specific hostnames 2015-08-26 20:21:45 -04:00
Richard Hansen
9af7f900d4 salt.modules.hosts.set_host: remove entry if alias is empty 2015-08-26 20:21:45 -04:00
Colton Myers
a9cdb633a4 Fix failing test 2015-08-26 16:08:50 -06:00
Colton Myers
64cad371f0 Remove overmocked test 2015-08-26 16:02:42 -06:00
Colton Myers
76c70162db Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    doc/topics/spm/index.rst
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/opennebula.py
    salt/cloud/clouds/openstack.py
    tests/unit/states/file_test.py
 2015-08-26 14:47:33 -06:00
Colton Myers
9b34335a20 Merge pull request #26359 from Akilesh1597/develop 
Ini issues fixed
 2015-08-25 15:47:48 -06:00
Colton Myers
6e72ae7f91 Merge pull request #26647 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-25 15:15:28 -06:00
Colton Myers
e2b72b8f8e Merge pull request #26646 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-25 15:15:14 -06:00
Colton Myers
353ec1ba7a Remove bad test 2015-08-25 14:08:04 -06:00
Colton Myers
3d6f7b0e6a Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/utils/aws.py
 2015-08-25 13:57:49 -06:00
Colton Myers
ed940ad5f5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/openstack.py
    tests/unit/modules/artifactory_test.py
    tests/unit/modules/groupadd_test.py
    tests/unit/modules/jboss7_test.py
    tests/unit/states/jboss7_test.py
 2015-08-25 13:55:44 -06:00
Joseph Hall
723734308b Merge pull request #26575 from msteed/raasify-spm 
Update spm for integration into raas
 2015-08-25 12:51:42 -06:00
Erik Johnson
ede057eebc Fix tests to reflect args being passed as lists instead of strings 2015-08-24 23:54:09 -05:00
Michael Steed
79a76c5cfe fixes 
- improve unit test coverage & fix bugs exposed thereby
- lint
 2015-08-24 14:11:55 -06:00
Justin Findlay
60087d0861 update unit tests for ini state 2015-08-24 12:08:10 -06:00
Pedro Algarvio
016e350c0f Merge pull request #26541 from terminalmage/masterless-winrepo 
Make winrepo execution module use the same code as the runner
 2015-08-22 22:47:31 +01:00
Erik Johnson
49d8bd1dbe Remove unused import 2015-08-21 22:54:54 -05:00
Erik Johnson
81a0d4c915 Skip tests that don't work with older mock 
This fixes test failures on RHEL6 builds.

This also removes two win_network tests which were clearly made to pass
only in Jenkins, and not in a chrooted build environment.
 2015-08-21 21:35:11 -05:00
Colton Myers
75f48b4a96 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/targeting/grains.rst
 2015-08-21 16:48:48 -06:00
Colton Myers
55ecff1278 Merge branch 'merge-forward-2015.8' of https://github.com/basepi/salt into basepi-merge-forward-2015.8 
Conflicts:
    salt/utils/event.py
 2015-08-21 16:37:24 -06:00
Michael Steed
186a4d052c wip: update spm for integration into raas 2015-08-21 16:20:42 -06:00
Erik Johnson
e7099af0f6 Get rid of useless unit tests and add integration test for winrepo 2015-08-21 13:14:42 -05:00
Ivan Babrou
c228088de6 Properly check for ipset ranges, fixes #26453 
This add support for idempotent runs of `ipset.present` state
if ranges are used as entries. IP1-IP2 and IP/MASK variants
are supported.
 2015-08-21 09:42:51 -06:00
Erik Johnson
d2166e95cb Fix formatting 2015-08-21 10:19:36 -05:00
Nicole Thomas
3d95aad2a5 Merge pull request #26283 from nmadhok/vmware-cloud-tests-develop 
Additional unit tests for VMware cloud driver
 2015-08-21 08:57:39 -06:00
Justin Findlay
4703ac3028 Merge pull request #26535 from bobrik/ipset-ranges 
Properly check for ipset ranges, fixes #26453
 2015-08-21 08:13:01 -06:00
Ageeleshwar Kandavelu
63efe11e4f ini modules test fix 2015-08-21 16:29:30 +05:30
Nitin Madhok
b2a1ec25e7 Lint fix 2015-08-21 06:46:41 -04:00
Nitin Madhok
df85bf351b Skip the unit tests that need pyVmomi installed if it is not present 2015-08-21 06:20:18 -04:00
Ageeleshwar Kandavelu
dd48f8ff50 ini_unit test fix 2015-08-21 14:47:13 +05:30
Ivan Babrou
5b82c45746 Properly check for ipset ranges, fixes #26453 
This add support for idempotent runs of `ipset.present` state
if ranges are used as entries. IP1-IP2 and IP/MASK variants
are supported.
 2015-08-21 09:18:54 +01:00
Ageeleshwar Kandavelu
77bc8fcc55 ini lint and formatting fixes 2015-08-21 12:36:11 +05:30
Ageeleshwar Kandavelu
73bfbab452 Merge from upstream 
Merge branch 'develop' of github.com:saltstack/salt into develop
 2015-08-21 08:59:43 +05:30
Colton Myers
ff2d6c6045 Fix git test 2015-08-20 16:23:36 -06:00
Colton Myers
a3fc46da0b py3 compat 2015-08-20 16:23:32 -06:00
Jenkins
f5131c2b46 More indent 2015-08-20 13:57:36 -06:00
Jenkins
52cde47aaf Fix failing event tests and modify event init 
There was a problem wherein two sockets would race to see which was connected first,
causing unit.utils.event_test.TestSaltEvent.test_event_multiple_clients to fail from
time to time. This gives a little breathing room to the second socket.

This also only does the pub connect if necessary on SaltEvent instantation.
 2015-08-20 13:41:07 -06:00
Colton Myers
2907a64052 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cli/batch.py
    salt/modules/git.py
    salt/utils/event.py
 2015-08-20 13:31:46 -06:00
Colton Myers
28aa9b1058 Merge pull request #26486 from thusoy/git-confidential-auth 
Git: Don't leak https user/pw to log
 2015-08-20 10:04:52 -06:00
Ageeleshwar Kandavelu
62af0d7f07 Merge from upstream 
Merge branch 'develop' of github.com:saltstack/salt into develop
 2015-08-20 20:06:01 +05:30
Ageeleshwar Kandavelu
b2ec235199 ini cosmetics fix 2015-08-20 20:05:36 +05:30
Tarjei Husøy
5289165487 Git: Don't leak https user/pw to log 2015-08-19 23:58:08 -07:00
Mike Place
a9b28e9577 Merge pull request #26483 from thusoy/git-user-only-auth 
Handle user-only http auth in git module
 2015-08-19 16:47:41 -06:00
Colton Myers
8d450b9acd Remove unused import 2015-08-19 16:38:34 -06:00
Colton Myers
aa3673385d Remove another heavily-mocked test 2015-08-19 16:08:00 -06:00
Colton Myers
2695e3159e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-08-19 15:05:52 -06:00
Jenkins
9d3f0624b4 Lint 2015-08-19 14:36:23 -06:00
Jenkins
5b7389d80e Fix schedule test error on py26 2015-08-19 14:33:38 -06:00
Tarjei Husøy
09fc934acc Handle user-only http auth in git module 2015-08-19 11:46:30 -07:00
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -06:00
Colton Myers
bf6c7e82cc Keep the formatted assertMsg 2015-08-18 12:50:24 -06:00
Colton Myers
f6481a1fb3 Merge pull request #26410 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-18 11:52:13 -06:00
Colton Myers
38f22875e1 Fix schedule test failures 
Includes removal of heavily-mocked test_list and test_reload
 2015-08-18 10:48:01 -06:00
Mike Place
4d6ebc6954 Merge pull request #26307 from cachedout/fix_26234 
Fix bug in top file ordering
 2015-08-18 10:02:54 -06:00
Mike Place
53d4739fa3 Merge pull request #26418 from driskell/fix_discarded_events_2015.8 
Fix forward-merged caching from 2015.5 into 2015.8 to be compatible with the new match_func
 2015-08-18 08:59:16 -06:00
Mike Place
9fa82ba0b7 Fix test 2015-08-18 08:51:00 -06:00
Mike Place
a3b32bbc9e Merge pull request #26413 from evverx/fix-start-restart-reload-and-force-reload 
Fix service.{start,restart,reload,force-reload} for masked services
 2015-08-18 08:16:15 -06:00
Jason Woods
63b195987e Fix forward-merged caching from 2015.5 into 2015.8 to be compatible with the new match_func 2015-08-18 14:37:23 +01:00
Erik Johnson
cc8a5b181e Remove unit tests for git states 
These need to be completely rewritten
 2015-08-17 22:10:39 -05:00
Erik Johnson
94941fbed1 Remove git unit tests 
These tests are useless, they assert true results while mocking
cmd.run_all to always return True with retcode 0. Nothing but a waste of
CPU cycles.
 2015-08-17 22:10:33 -05:00
Evgeny Vereshchagin
31ac42cac3 Fix service.{start,restart,reload,force-reload} for masked services 2015-08-18 00:57:52 +00:00
Colton Myers
f3c8ba85dc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/modules/systemd.py
    salt/utils/aws.py
 2015-08-17 17:06:59 -06:00
Colton Myers
d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/keystone.py
    salt/modules/pw_user.py
    salt/states/reg.py
    setup.py
 2015-08-17 16:54:16 -06:00
Evgeny Vereshchagin
ab4d6e5323 Fix service.enable for masked services 2015-08-17 14:00:20 -06:00
Mike Place
8bb57d1631 Merge pull request #26342 from rallytime/fix-16049 
Don't call boto_elb._attributes_present if no attributes were provided
 2015-08-17 13:19:08 -06:00
Mike Place
b62b2d6797 Merge pull request #26318 from evverx/enable-masked-services 
Fix service.enable for masked services
 2015-08-17 12:57:43 -06:00
Thomas S Hatch
0046c6cfed Merge pull request #26300 from jfindlay/pw_test 
mock pwd function calls in pw_user exec module
 2015-08-17 12:56:41 -06:00
Thomas S Hatch
9d64b419d2 Merge pull request #26272 from garethgreenaway/schedule_list_show_jobs_enabled 
Fixes to schedule module
 2015-08-17 12:54:24 -06:00
rallytime
211f6feaf5 Fix test failures - get_attributes shouldn't be called if none are provided 2015-08-17 10:58:44 -06:00
Pedro Algarvio
a73ca74bc3 White-space lint fix 2015-08-17 15:28:22 +01:00
Pedro Algarvio
8f69530f65 Add the unit tests for Schema in a DictItem properties 2015-08-17 13:20:18 +01:00
Pedro Algarvio
fa826c9ba2 Add a validation test for DictItem required attribute validation 2015-08-17 13:58:22 +01:00
Pedro Algarvio
f74cc21d70 DictItem must also define it's require attribute 2015-08-17 13:56:00 +01:00
Pedro Algarvio
a0af17dbde Double to single quotes 2015-08-17 13:54:12 +01:00
Evgeny Vereshchagin
ecb6b7d40f Fix service.enable for masked services 2015-08-14 13:09:20 +00:00
Justin Findlay
ee59d154d7 Merge pull request #26293 from jfindlay/reggie 
Fix #26268
 2015-08-13 13:48:06 -06:00
Justin Findlay
7e94989403 mock pwd calls in pw_user exec mod test 
Fixes #26266.
 2015-08-13 13:20:11 -06:00
Justin Findlay
3348b726c9 fix state/reg unit tests 2015-08-13 12:13:02 -06:00
Gareth J. Greenaway
ac36c3e979 Two more fixes to unit tests reflecting changes. 2015-08-13 10:53:37 -07:00
Mike Place
65ab5aa495 Merge pull request #26263 from rallytime/fix-24882 
Don't make changes when test=True for openstack present/absent funcs
 2015-08-13 10:30:31 -06:00
Gareth J. Greenaway
22ac074f5d Additional changes to ensure unit tests pass. 2015-08-13 08:21:09 -07:00
Nitin Madhok
57c103d70e Adding more unit tests 2015-08-13 10:44:46 -04:00
Nitin Madhok
020994bb07 Fix lint 2015-08-13 09:30:27 -04:00
Nitin Madhok
5b05740dd4 Adding additional unit tests 2015-08-13 09:27:42 -04:00
Nitin Madhok
a88be9f756 Splitting asserts in multiple line for readability 2015-08-13 07:27:16 -04:00
Nitin Madhok
af4c058bd8 Adding more unit tests for vmware cloud driver 2015-08-13 07:07:11 -04:00
Nitin Madhok
e687434b0c Adding more unit tests for create_datacenter and create_cluster 2015-08-13 02:10:43 -04:00
Gareth J. Greenaway
89576e870f Updating unit tests to reflect changes to schedule module. 2015-08-12 17:44:37 -07:00
twangboy
a1274c438d I might have fixed some tests... I might have made them worse 2015-08-12 17:13:50 -06:00
rallytime
86b8161d22 Mock test key in __opts__ dict 2015-08-12 14:29:33 -06:00
Justin Findlay
4cf9a16e63 Merge pull request #26224 from cachedout/fopen_2015_8 
Cleanup of a few cases to move to salt.utils.fopen
 2015-08-12 14:15:49 -06:00
Mike Place
8e1b5da2e0 Merge pull request #26219 from alprs/fix-cron_identifier_default 
cron: make identifier default to state ID
 2015-08-12 12:42:33 -06:00
C. R. Oldham
7fc3232633 Merge 2015.8 forward to develop (get ldap fix) 2015-08-12 11:37:04 -06:00
Nicole Thomas
6730990bbc Merge pull request #26248 from nmadhok/vmware-cloud-test-2015.8 
Initial commit of unit tests for vmware cloud driver
 2015-08-12 10:59:15 -06:00
Colton Myers
1c661abc91 Skip failing event tests 
@driskell it would be great if you could fix these up when you do your
2015.8 refactor
 2015-08-12 10:15:11 -06:00
Nitin Madhok
fd7c365999 Lint Fix 2015-08-12 10:48:10 -04:00
Nitin Madhok
6cc5f97e92 Lint Fix 2015-08-12 10:47:49 -04:00
Nitin Madhok
f0c2b9c5ef Lint fix 2015-08-12 10:47:10 -04:00
Nitin Madhok
416a95cad6 Initial commit of unit tests for vmware cloud driver 2015-08-12 10:44:20 -04:00
Nitin Madhok
7c33f0ad54 Initial commit of unit tests for vmware cloud driver 2015-08-12 10:33:42 -04:00
Nitin Madhok
a8bfe5ec1f Initial commit of unit tests for vmware cloud driver 2015-08-12 10:30:14 -04:00
Andreas Lutro
1f02e1671b cron: fix a typo in the tests 2015-08-12 10:08:43 +02:00
Andreas Lutro
9b18cd9050 cron: more descriptive tests, updated to reflect new behavior 2015-08-12 10:06:53 +02:00
Colton Myers
426b1631c6 Remove stray subscribe 2015-08-11 23:12:18 -06:00
Colton Myers
110cae3cdc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-08-11 18:14:31 -06:00
Colton Myers
1502a39779 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    conf/minion
    salt/client/__init__.py
    salt/states/dockerio.py
    salt/utils/event.py
    tests/unit/utils/event_test.py
 2015-08-11 18:12:21 -06:00
Mike Place
b5980ca54a Migrate wtmp beacon to fopen 2015-08-11 15:57:04 -06:00
Mike Place
8ad37e0558 Remove debugger 2015-08-11 11:29:19 -06:00
Mike Place
05c21297de Fix env ordering in merged list 2015-08-11 11:29:13 -06:00
Mike Place
8ca0e59891 Lint 2015-08-11 11:28:59 -06:00
Mike Place
cfb6982227 Adding some dictupdate merge tests 
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
 2015-08-11 11:28:40 -06:00
Mike Place
889b4d2795 Merge pull request #24878 from cachedout/issue_12483 
Top file enhancements
 2015-08-11 11:24:46 -06:00
Mike Place
3a495133f8 Merge pull request #26193 from rallytime/one-testing 
Add more unit tests to the OpenNebula driver
 2015-08-11 09:24:16 -06:00
rallytime
a3b673cfca Pylint fix 2015-08-11 09:23:28 -06:00
rallytime
14fe0b88af Add more unit tests to the OpenNebula driver 2015-08-10 17:15:38 -06:00
Colton Myers
ee4b788745 Skip tests that require windows libraries if not present 2015-08-10 16:57:06 -06:00
Colton Myers
49fb19049b Remove outdated heavily-mocked unit test 2015-08-10 16:54:17 -06:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
 2015-08-10 13:27:31 -06:00
Colton Myers
0fc16040d6 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/__init__.py
    salt/cloud/clouds/vmware.py
    salt/loader.py
    salt/minion.py
    salt/modules/archive.py
    salt/modules/file.py
    salt/states/pkg.py
    salt/utils/http.py
 2015-08-10 13:21:57 -06:00
Mike Place
f39780f8ce Merge pull request #26000 from driskell/fix_discarded_events 
Implement full event caching for subscribed tags
 2015-08-10 12:57:17 -06:00
Mike Place
2704094e21 Merge pull request #26125 from evverx/timedatectl-settz 
Use timedatectl set-timezone to tzsetting if available
 2015-08-10 08:43:41 -06:00
Erik Johnson
56798d724c Fix comment in return value 2015-08-09 22:07:02 -05:00
Erik Johnson
18ebdd382a Update winrepo tests with new param names 2015-08-09 21:19:45 -05:00
Evgeny Vereshchagin
694ba4d0c6 Check the tzname before the tzfiles hashsums 
Fix #12654, #24964
 2015-08-09 07:24:18 +03:00
Thomas S Hatch
3d04960e71 Merge pull request #26134 from thatch45/pchanges2 
Pchanges2
 2015-08-08 21:04:34 -06:00
Evgeny Vereshchagin
e5eaf4686a Use timedatectl set-timezone to tzsetting 
Fixed #26122
 2015-08-09 06:00:35 +03:00
Thomas S Hatch
2ddf5c4e58 lint 2015-08-08 20:17:45 -06:00
C. R. Oldham
28329fff55 These tests make no sense now that the proxy interface is module based and not object based. 2015-08-08 14:44:33 -06:00
Thomas S Hatch
912d6041f5 apply @cachedout's tests 2015-08-08 09:37:16 -06:00
Thomas S Hatch
0e705d2185 add pchanges docs 2015-08-08 09:32:29 -06:00
rallytime
8ae98b2bf4 Remaining template_* unit tests for OpenNebula 2015-08-07 16:34:05 -06:00
rallytime
fa58787227 Unit tests for vn_* functions for the OpenNebual driver 2015-08-07 16:10:55 -06:00
rallytime
7855a388e3 Wrote more unit tests for the OpenNebula driver 
Also fixed a couple of minor bugs found along the way.
 2015-08-07 15:12:04 -06:00
Mike Place
bebb337178 Remove debugger 2015-08-07 12:12:33 -06:00
Mike Place
246a9d790a Fix env ordering in merged list 2015-08-07 11:45:11 -06:00
Mike Place
e1dd521d57 Lint 2015-08-07 10:43:19 -06:00
Mike Place
13d544b675 Adding some dictupdate merge tests 
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
 2015-08-07 10:43:19 -06:00
Mike Place
41fc026cff Merge pull request #26072 from QuinnyPig/update-rvm 
Updated rvm installer script link as per upstream
 2015-08-07 08:56:19 -06:00
Mike Place
11fa9c3cc2 Merge pull request #26085 from rallytime/one-tests 
Added more unit tests to OpenNebula driver
 2015-08-07 08:33:11 -06:00
rallytime
a639c28050 Added more unit tests to OpenNebula driver 
Also fixed some minor bugs found along the way.
 2015-08-06 17:22:51 -06:00
Corey Quinn
d5cb70360f Fixed to expanded URL 2015-08-06 13:14:39 -07:00
Corey Quinn
e4f78637a0 Updated rvm installer script link as per upstream 2015-08-06 11:47:30 -07:00
Justin Findlay
6c6f407f66 Merge pull request #26050 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-06 11:03:54 -06:00
rallytime
3811332a80 Add more OpenNebula unit tests 2015-08-05 16:42:14 -06:00
Colton Myers
d332d54eec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-08-05 15:32:11 -06:00
Colton Myers
a4d4f8c5f8 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/linode.py
    salt/modules/layman.py
    salt/modules/win_system.py
 2015-08-05 15:30:04 -06:00
rallytime
1b5a9bc91d Pylint fix 2015-08-05 10:05:29 -06:00
Jason Woods
65acf975dd Implement full event caching for subscribed tags 
Require all multitasking contexts to subscribe to their events so one call to get_event for one tag does not discard events that should be saved for a subsequent call to get_event with another tag.
Use blocking get_event in batching with very small timeout.
Fixes #25998
 2015-08-05 11:58:32 +01:00
twangboy
0502897635 Fixed the lint... again 2015-08-04 17:43:58 -06:00
twangboy
6f85d6b9af Fixed some lint 2015-08-04 17:13:47 -06:00
rallytime
78ea0f246e Started writing unit tests for OpenNebula driver 
Also fixed up some inconsistencies and bugs found along the way
 2015-08-04 16:45:09 -06:00
Justin Findlay
9156bbd33e update win_system exec mod unit tests 2015-08-04 15:55:32 -06:00
Mike Place
85f5e2a443 Fix failing tests 2015-08-04 09:48:43 -06:00
Dmitry Kuzmenko
5c6276ac7d Subscribe event to bus is optional now 
Once subscribed to publisher SUB socket gets collecting all incoming
messages that is unwanted behavior for fire-only events.
Fixed by using listen=<True|False> constructor argument.
 2015-08-03 16:10:38 -06:00
Colton Myers
d5fbd960fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/fileserver/s3fs.py
    salt/modules/chocolatey.py
    salt/modules/s3.py
    salt/modules/zpool.py
    salt/pillar/s3.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
 2015-08-03 15:01:35 -06:00
Colton Myers
4d8ba6b874 Remove reg unit tests, not applicable to latest version of reg module 2015-08-03 12:03:03 -06:00
Colton Myers
abf389743a Merge pull request #25903 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-03 11:12:18 -06:00
Pedro Algarvio
05165467e8 Allow schemas to override it's class attribute name 2015-07-31 22:42:43 +01:00
Pedro Algarvio
55918b7d50 Allow schema items to override it's class attribute name 2015-07-31 21:00:22 +01:00
Colton Myers
d8c5dfb33f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-30 16:58:19 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Thomas Jackson
fb4cdc475f Keep track of SyncWrapper's IOLoop usage 
While thinking through issues that might cause #25718 I ran into this case-- where you can create 2 sync wrappers with the same parent IOLoop and run into problems because you can't start/stop the loop multiple times like that and have the call tree work correctly. To solve this (since it *should* be the exceptional case) I'm making SyncWrapper keep track of which loops are in use-- then if someone attempts this situation it will simply make another one.
 2015-07-29 08:48:33 -07:00
Dmitry Kuzmenko
bf9dd00aac Subscribe event to bus is optional now 
Once subscribed to publisher SUB socket gets collecting all incoming
messages that is unwanted behavior for fire-only events.
Fixed by using listen=<True|False> constructor argument.
 2015-07-29 17:44:02 +03:00
Mike Place
fefb4eb79b Merge pull request #25767 from techhat/awskms 
Add AWS KMS support to S3
 2015-07-28 10:00:41 -06:00
Mike Place
ada3a29e55 Fix broken test for file.copy 2015-07-28 09:57:49 -06:00
Pedro Algarvio
df5aaeef61 Merge pull request #25772 from s0undt3ch/features/raas-5-salt-ssh 
Salt-SSH Py3 thin & Config schema
 2015-07-28 16:39:20 +01:00
Thomas S Hatch
f4a3583595 Merge pull request #25762 from jfindlay/etcd 
Fix #24959 unit tests
 2015-07-28 09:32:24 -06:00
Thomas S Hatch
1fae76d53c Merge pull request #25685 from twangboy/fix_25594 
Fixed regex issues with comment and uncomment
 2015-07-28 09:29:49 -06:00
Pedro Algarvio
359348ba1c Fix SSH Roster Schema unittests 2015-07-28 12:37:19 +01:00
Pedro Algarvio
034353040c Make the tests discoverable 2015-07-28 12:23:18 +01:00
Pedro Algarvio
c7b5fccb9e Change cwd back to Salt's code dir 2015-07-28 12:22:53 +01:00
Pedro Algarvio
d649252878 Fix class reference 2015-07-28 10:33:08 +01:00
Pedro Algarvio
10c47647e3 Also rename the test module 2015-07-28 10:33:08 +01:00
Joseph Hall
37ff73d935 Update tests 2015-07-27 18:56:55 -06:00
Pedro Algarvio
143e8fa200 Let's call it for what it is! 2015-07-28 00:42:55 +01:00
Pedro Algarvio
63cecaddf4 Implement the Roster config schema 2015-07-28 00:42:55 +01:00
Pedro Algarvio
eabc84d93c Implemented RosterEntryConfig and added unit tests for it 2015-07-28 00:42:55 +01:00
Pedro Algarvio
ddf814174e Rename the config unit tests module 2015-07-28 00:42:54 +01:00
twangboy
a904e8329b Fixed another test failure... 2015-07-27 15:05:23 -06:00
Justin Findlay
de344e465c fix etcd_mod unit tests 2015-07-27 14:13:34 -06:00
Justin Findlay
b3bed2d5d2 Merge pull request #25754 from s0undt3ch/develop 
Merge 2015.8 forward to develop
 2015-07-27 13:34:56 -06:00
David Boucha
f05ae95f9c Merge pull request #25648 from twangboy/fix_25352 
Clarified functionality of reg module, fixed state to work with new module
 2015-07-27 13:30:33 -06:00
Thomas S Hatch
6ebc61b0c8 Merge pull request #25734 from Unity-Technologies/wait-after-reboot 
Added a way to wait for a reboot to complete on Windows
 2015-07-27 11:47:03 -06:00
Pedro Algarvio
1010eef5ff Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-27 18:20:50 +01:00
twangboy
aa077d3a86 Fixed more tests... justin findlay helped me... 2015-07-27 11:18:25 -06:00
Justin Findlay
3b0cc6592a fix reg unit tests 2015-07-27 10:57:05 -06:00
Daniel Hobley
1ad9da30e5 Added a way to wait for a reboot to complete on Windows 
- This is useful if you have many states that are being run in a highstate and you don't want the rest of the states, running just before a reboot as this could lead to half complete states i.e installing software
 2015-07-27 14:16:02 +02:00
twangboy
87c8f8dfb5 Fixed some tests... maybe... 2015-07-24 15:07:45 -06:00
Thomas S Hatch
c30a1976c6 Merge pull request #25612 from arthurlogilab/state_postgresql_cluster 
[states] postgresql_cluster support (backed by the postgresql cluster modules)
 2015-07-24 10:34:11 -06:00
twangboy
b473fb7827 Fixed some tests... maybe... 2015-07-24 09:40:46 -06:00
Stanislav Blokhin
595da6252e Configurable AWS region & region from IAM metadata 2015-07-24 16:06:20 +02:00
Andreas Lutro
dd2a188c05 fix tests 2015-07-23 15:17:18 +02:00
Arthur Lutz
555d7b867f pylint fixes 2015-07-23 09:02:44 +02:00
Arthur Lutz
5607957828 [states/postgresql_cluster] pylint fixes 2015-07-23 08:20:26 +02:00
Mike Place
41b760429a Merge pull request #25587 from cachedout/issue_16969 
Fix prereq in salt.state
 2015-07-22 14:05:02 -06:00
Colton Myers
2cb1189ff9 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/grains/core.py
 2015-07-22 12:17:58 -06:00
Colton Myers
c63ef2c7b2 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/modules/gem.py
    salt/modules/ssh.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/states/pkg.py
    salt/utils/__init__.py
    salt/utils/s3.py
 2015-07-22 12:05:50 -06:00
Mike Place
6f65fbdb82 Fix test 2015-07-22 11:43:19 -06:00
Mike Place
bc2321a5c6 Merge pull request #25595 from terminalmage/git_pillar-rewrite 
Bring git_pillar up to feature parity with gitfs
 2015-07-22 10:55:13 -06:00
Mike Place
3fe4a75a7f Merge pull request #25578 from davidjb/relative-includes 
Allow parent relative includes in state files
 2015-07-22 10:51:12 -06:00
Erik Johnson
123b8ee1cb Fix mock_open patch 
Forgot to add this when I removed the decorator in my previous commit.
 2015-07-22 11:09:15 -05:00
Erik Johnson
a1ffa0c1c4 More test fixes 2015-07-22 10:40:49 -05:00
Arthur Lutz
5f727fe8b2 [states] postgresql_cluster support (backed by the postgresql cluster modules) 
developped with David Douard <david.douard@logilab.fr> @douardda

closes #21293
 2015-07-22 17:39:08 +02:00
Erik Johnson
af82835f42 Move patching of mock_open to within test 
This keeps the tests from failing on platforms like RHEL6 where
unittest2 has no mock_open.
 2015-07-22 03:04:07 -05:00
Erik Johnson
73192390a2 Test fixes 2015-07-22 00:48:43 -05:00
David\ Beitey
9ad0ddc549 Allow parent relative includes in state files 
This implements the solution to #25477.  Any ``include`` directives
within state files can use multiple dot notation (influenced by Python
relative imports) to refer to a parent state.

This also implements the same functionality inside the stateconf
renderer
(http://docs.saltstack.com/en/latest/ref/renderers/all/salt.renderers.stateconf.html),
which supported relative includes, excludes, and prefixed states.  This
PR expands on existing tests for stateconf.

This also updates the documentation accordingly.
 2015-07-21 16:32:38 +10:00
Colton Myers
7aef58b44f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-20 13:57:00 -06:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
twangboy
5008bfee96 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_21041_again 2015-07-20 12:51:43 -06:00
twangboy
8b2dc681f9 Fixed the gem module to work on windows... without injection 2015-07-20 12:50:33 -06:00
Mike Place
89d595f002 Lint config_test 2015-07-20 11:18:31 -06:00
Pedro Algarvio
7c0ad43906 Another fix for flattened properties and test cases 2015-07-17 18:24:43 +01:00
Pedro Algarvio
85b191c4b9 Test case to make sure plain string requirements have the same outcome 2015-07-17 17:58:52 +01:00
Pedro Algarvio
6b09ec0c30 Fix requirements items since they broke with the previous 2 commits. 2015-07-17 17:23:17 +01:00
Pedro Algarvio
6e1ee65421 Test case for missing required entries when flattening Schemas 2015-07-17 17:23:07 +01:00
Justin Findlay
704b68b3f4 Merge pull request #25494 from s0undt3ch/develop 
Merge 2015.8 forward to develop
 2015-07-16 22:55:06 -06:00
Thomas S Hatch
7a0bb9df1e Merge pull request #25453 from isbm/isbm-libvirt 
Improving libvirt
 2015-07-16 14:26:03 -06:00
Pedro Algarvio
f8ee8c1ba9 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-16 20:08:28 +01:00
Pedro Algarvio
393a21117e Rename the module 2015-07-16 17:04:22 +01:00
Pedro Algarvio
42bfec8bb5 Let's call it for what it is! 2015-07-16 17:01:42 +01:00
Justin Findlay
40889d7d7e rewrite GPG unit tests 2015-07-16 09:37:37 -06:00
Joe Julian
1b7a56aa38 Add support for pyOpenSSL > 0.10 
Centos 6 doesn't provide a packaged version of pyOpenSSL > 0.10. Allow
the tls module to work with that minimum version. This will not allow
X509 extensions to work but will allow everything else.

Fixes #25384
 2015-07-15 16:49:54 -07:00
Ryan Lewis
a8abe21b1b Wildcard support for get_flags_from_package_conf 2015-07-16 08:19:02 +12:00
Bo Maryniuk
a35c84f40b Fix test for "stop" function 2015-07-15 19:03:48 +02:00
Bo Maryniuk
4040c82515 Fix test for "start" function 2015-07-15 19:03:37 +02:00
Bo Maryniuk
fa5163033e Fix test for "list_domains" function 2015-07-15 19:03:18 +02:00
Bo Maryniuk
63202ac3ec Rename 'list_vms' to 'list_domains' for consistent terminology 2015-07-15 13:09:12 +02:00
Bo Maryniuk
d55633b796 Fix tests for the virt state 2015-07-15 13:09:11 +02:00
Ryan Lewis
3b15a97c76 Add some unit tests for modules/portage_config.py 2015-07-15 14:46:10 +12:00
Jonathan Leroy
bc36d05c0c
Support for IPv6 addresses scopes in network.interfaces (ifconfig) 2015-07-15 01:14:32 +02:00
Colton Myers
2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/requisites.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/config.py
    salt/minion.py
    salt/modules/cp.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-07-14 10:57:36 -06:00
Mike Place
aa8837108a Correct broken slack tests 2015-07-14 10:35:06 -06:00
Mike Place
8faa49a226 IPC transport skeleton 
Basic IPC server works!

Lint

Skeleton of client

IPC bind test

Make stand-alone

Adding factories for push and pull channels

Allowing opts passing for consistency

Tests now (mostly) work

Lint

Method documentation

General cleanup. Migrate to inheritence.

Log cleanup

Migrate framing to stand-along module

Migrate ipc.py to new framer

Working except for serialization bug

Debugging

Debugging

It works!!

Remove ZeroMQ from TCP transport :]

General cleanup

Linting

General cleanup

Align socket name with what client expects

Remove unused buffer size flag

exception handling for stream close

Calls to parent class inits

Docs

Remove debugging

Remove unused function

Remove unnecessary pre/post fork on msgclient

Remove unecessary timeout flag

Better stream/socket shutdown in server

Remove unused handler

Removing more unused

More function cleanup

Removing more unneeded cruft

Lint

Round out documentation

More docs

Misc hacks to fix up @cachedout's IPC

This was using a mix of blocking and non-blocking calls, which was making a bit of a mess. connect and write are both non-blocking calls on IOStreams, so we either need to handle all the callbacks or do them in the coroutine fashion (much easier to manage). This meant that in the tests your "write" wouldn't make it out since we didn't wait on the connect.

IMO we should refactor this IPC stuff to have proper async interfaces and wrap if absolutely necessary, but I think its reasonable to ask that as part of this we make some more of the core coroutines :)

for #23236

Lint

Remove init of io_loop because we require start()

Various fixes

Remove uneeded functionality

Remove dup

Cleanup and remove unused functions

Moving toward coroutines

More lint

handle_connection changed to spawn

Singletons for ipcclient

Lint disable

Remove redundent check in close()

Remove duplicates in init

Improved exception handling

Test framework

Require sock path to be passed in

Better testing approach

Remove unecessary __init__

Misc cleanup of unecessary methods

Major rework of the IPC channels to make them work :)

Remove TODO, since the feature was implemented

Add more tests for IPC

Add support for reconnecting clients, as well as a return from the IPCServer

misc cleanup

Lint test case

Lint transport
 2015-07-14 08:47:09 -06:00
Mike Place
727e322188 Merge pull request #23236 from cachedout/ipc 
Remove ZeroMQ dependency from master publisher
 2015-07-13 17:42:43 -06:00
Mike Place
9cc897fd69 Fix tests for #24985 2015-07-13 16:19:21 -06:00
Mike Place
bcd91a9ecb Merge pull request #25245 from jdsieci/rh_int_conf_opts 
Added new options for RH interface configuration
 2015-07-13 15:16:11 -06:00
Mike Place
fcd9197f86 IPC transport skeleton 
Basic IPC server works!

Lint

Skeleton of client

IPC bind test

Make stand-alone

Adding factories for push and pull channels

Allowing opts passing for consistency

Tests now (mostly) work

Lint

Method documentation

General cleanup. Migrate to inheritence.

Log cleanup

Migrate framing to stand-along module

Migrate ipc.py to new framer

Working except for serialization bug

Debugging

Debugging

It works!!

Remove ZeroMQ from TCP transport :]

General cleanup

Linting

General cleanup

Align socket name with what client expects

Remove unused buffer size flag

exception handling for stream close

Calls to parent class inits

Docs

Remove debugging

Remove unused function

Remove unnecessary pre/post fork on msgclient

Remove unecessary timeout flag

Better stream/socket shutdown in server

Remove unused handler

Removing more unused

More function cleanup

Removing more unneeded cruft

Lint

Round out documentation

More docs

Misc hacks to fix up @cachedout's IPC

This was using a mix of blocking and non-blocking calls, which was making a bit of a mess. connect and write are both non-blocking calls on IOStreams, so we either need to handle all the callbacks or do them in the coroutine fashion (much easier to manage). This meant that in the tests your "write" wouldn't make it out since we didn't wait on the connect.

IMO we should refactor this IPC stuff to have proper async interfaces and wrap if absolutely necessary, but I think its reasonable to ask that as part of this we make some more of the core coroutines :)

for #23236

Lint

Remove init of io_loop because we require start()

Various fixes

Remove uneeded functionality

Remove dup

Cleanup and remove unused functions

Moving toward coroutines

More lint

handle_connection changed to spawn

Singletons for ipcclient

Lint disable

Remove redundent check in close()

Remove duplicates in init

Improved exception handling

Test framework

Require sock path to be passed in

Better testing approach

Remove unecessary __init__

Misc cleanup of unecessary methods

Major rework of the IPC channels to make them work :)

Remove TODO, since the feature was implemented

Add more tests for IPC

Add support for reconnecting clients, as well as a return from the IPCServer

misc cleanup

Lint test case

Lint transport
 2015-07-13 14:44:10 -06:00
Pedro Algarvio
7a796440c0 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-10 11:16:48 +01:00
Thomas S Hatch
a0e585f8f8 Merge pull request #25267 from jfindlay/disk_mod 
Disk module improvements
 2015-07-09 19:30:45 -06:00
Thomas S Hatch
9b6646d578 Merge pull request #25269 from jfindlay/tomcat 
Extract tomcat war version
 2015-07-09 19:28:21 -06:00
Pedro Algarvio
1388010187 Remove hardcoded maxDiff 2015-07-09 20:59:59 +01:00
Pedro Algarvio
3adb731abc Fixed ordering issue 2015-07-09 20:57:23 +01:00
Pedro Algarvio
cf071eaffa Add test which asserts proper field ordering 2015-07-09 17:32:50 +01:00
Jerzy Drozdz
b95681efc1 Merge remote-tracking branch 'upstream/develop' into rh_int_conf_opts 2015-07-09 15:43:24 +02:00
Colton Myers
a40574850f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-08 16:26:25 -06:00
Colton Myers
3a7289a0cb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/all/salt.states.aptpkg.rst
    doc/ref/states/all/salt.states.etcd_mod.rst
    doc/topics/releases/releasecandidate.rst
    salt/client/mixins.py
    salt/modules/win_pkg.py
    tests/unit/modules/boto_vpc_test.py
 2015-07-08 16:24:58 -06:00
Justin Findlay
59dc833567 update tomcat war_deployed state tests 2015-07-08 15:39:52 -06:00
Justin Findlay
beb9715d0e update blockdev tests for deprecation 2015-07-08 14:50:52 -06:00
rallytime
138c4f1e72 Remove parted deprecations and fix failing tests 2015-07-08 09:03:55 -06:00
Jerzy Drozdz
8d642229c6 Merge remote-tracking branch 'upstream/develop' into rh_int_conf_opts 2015-07-08 16:41:37 +02:00
Jerzy Drozdz
a2b3f3eca5 PyLint problems fix 2015-07-08 16:40:57 +02:00
Pedro Algarvio
39c1e32f47 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-08 11:47:25 +01:00
Pedro Algarvio
f36123c4df ArrayConfig must have items passed. Added DictConfig with tests. 2015-07-07 15:10:16 +01:00
rallytime
f959e165a1 Clean up imports 2015-07-07 06:28:10 -06:00
rallytime
fbc9c0d6bf Fix Pylint 2015-07-07 05:43:00 -06:00
Pedro Algarvio
884212532a Add test for subclassed Configuration classes 2015-07-07 10:45:29 +01:00
Colton Myers
9fde9df55b Remove tests (glance rewrite requires test rewrite) 2015-07-06 14:13:15 -06:00
rallytime
fe2561f415 Update moto version check in boto_vpc_test and update min version 
Fixes #24272
 2015-07-06 14:03:59 -06:00
Erik Johnson
bd46c875ea Merge pull request #25162 from ticosax/dockerng-fix-pull-force 
[dockerng] Do not call inspect_image if we know the image is not downloaded
 2015-07-06 10:18:16 -05:00
Mike Place
a67156e34f Fix tests for #25115 2015-07-06 08:54:45 -06:00
Nicolas Delaby
48f20b9739 Do not call inspect_image if we know the image is not downloaded 2015-07-06 14:01:25 +02:00
Pedro Algarvio
0cbf22d884 Merge pull request #25145 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Implement `oneOf`, `anyOf`, `allOf` and `not` with unit tests
 2015-07-03 17:56:44 +01:00
Pedro Algarvio
44738b2123 Lint fixes 2015-07-03 17:56:31 +01:00
Pedro Algarvio
f84c3e4fbd Add support for enumNames 2015-07-03 16:40:48 +01:00
Pedro Algarvio
0d9173c57e Remove repeated test 2015-07-03 16:28:57 +01:00
Pedro Algarvio
625e0b6c06 Implement oneOf, anyOf, allOf and not with unit tests 2015-07-03 16:24:46 +01:00
Thomas S Hatch
3922992e6b Merge pull request #25131 from s0undt3ch/features/raas-17-salt-cloud-2015.8 
Array support in salt.utils.config
 2015-07-02 13:40:34 -06:00
Pedro Algarvio
237023dde0 Support Configuration as an array item 2015-07-02 17:38:06 +01:00
Pedro Algarvio
51e76c3a38 Properly handle salt.utils.config.Null 2015-07-02 17:38:06 +01:00
Pedro Algarvio
e0f4706ef6 Add array support to salt.utils.config (with unit tests) 2015-07-02 17:38:06 +01:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Pedro Algarvio
f65501fff4 Merge pull request #25106 from s0undt3ch/features/raas-17-salt-cloud-ng 
Minor refactor + Unit tests for salt.utils.config + minor changes to 2 cloud drivers
 2015-07-02 11:58:34 +01:00
Pedro Algarvio
545d7e0a34 PyLint fixes 2015-07-02 10:10:25 +01:00
Pedro Algarvio
07167422ba Also test pattern 2015-07-02 10:08:08 +01:00
Pedro Algarvio
4d4e94b59c Unit tests for salt.utils.config 2015-07-01 18:18:31 +01:00
Justin Findlay
071ee44d41 Revert "Revert "adding states/postgres_database unit test case."" 2015-07-01 09:47:08 -06:00
Justin Findlay
bf8c7e7a9d Merge pull request #24362 from jayeshka/postgres_user-states-unit-test 
adding states/postgres_user unit test case.
 2015-07-01 15:45:31 -06:00
Justin Findlay
4195cea512 Merge pull request #24361 from jayeshka/postgres_schema-states-unit-test 
adding states/postgres_schema unit test case.
 2015-07-01 15:44:56 -06:00
Justin Findlay
ada8fe57d4 Merge pull request #24331 from jayeshka/postgres_extension-states-unit-test 
adding states/postgres_extension unit test case.
 2015-07-01 15:43:58 -06:00
Justin Anderson
21709aa483 Merge pull request #25096 from jfindlay/postgres_group_test 
Postgres group test
 2015-07-01 12:48:25 -06:00
David Boucha
0a846400c6 Merge pull request #25085 from jfindlay/fix_file 
accept all sources in the file state
 2015-07-01 12:23:45 -06:00
Justin Findlay
a98394210e Merge pull request #25095 from jfindlay/win_groupadd_test 
Win groupadd unit tests
 2015-07-01 12:18:53 -06:00
Justin Findlay
3c379dc115 declobber postgres state unit test mocking 2015-07-01 12:01:50 -06:00
Justin Findlay
564dffd14a depend on win libs rather than mocking them 2015-07-01 11:14:19 -06:00
Justin Findlay
937a252e16 remove unnecessary file state tests 2015-06-30 17:16:17 -06:00
Colton Myers
99fc7ecb4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/fileclient.py
    salt/modules/file.py
    salt/modules/gpg.py
 2015-06-29 16:49:40 -06:00
Mike Place
db9d61251b Lint 2015-06-29 16:16:11 -06:00
Mike Place
afbe54e677 Reset grains opts on each test 2015-06-29 16:15:41 -06:00
Thomas S Hatch
51ac7ae038 Merge pull request #24963 from whytewolf/neutron-update 
Neutron.create_network more in line with neutron net-create, with test
 2015-06-29 09:46:08 -07:00
Mike Place
96a6e446da Try another way to fix grains test 2015-06-29 10:42:13 -06:00
Jayesh Kariya
e3045be5a9 adding redismod unit test case. 2015-06-29 14:13:45 +05:30
Jayesh Kariya
bb0a6d5625 adding states/supervisord unit test case. 2015-06-26 13:06:53 +05:30
Colton Myers
f65e663353 Merge pull request #24937 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-25 16:03:47 -06:00
Mike Place
d48af16594 Set grains test to local 2015-06-25 15:30:16 -06:00
Colton Myers
63667e0d49 Add more side effects 2015-06-25 14:08:47 -06:00
Gareth J. Greenaway
55eb73b0c9 fixing unit tests. 2015-06-25 11:33:36 -07:00
Colton Myers
880760f813 Fix ssh_auth test 2015-06-25 11:17:00 -06:00
Thomas Phipps
09ed674491 forgot the unit test. or at least couldn't find it originally. 2015-06-24 17:09:13 -07:00
Colton Myers
acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/utils/cloud.py
    salt/utils/job.py
 2015-06-24 11:44:04 -06:00
justinta89
bdb7a19c36 Fixed ps module to not use depreciated psutil commands 2015-06-24 11:31:07 -06:00
Mike Place
78eb91ce0b Merge pull request #24932 from cachedout/fix_grains_test 
Fix grains test
 2015-06-24 10:47:08 -06:00
Mike Place
e1069741ea Fix grains test 2015-06-24 10:46:40 -06:00
Thomas S Hatch
2a91f6f06d Merge pull request #24734 from garethgreenaway/config_changes 
Alllow configuration items using either module.key or module:key
 2015-06-24 10:46:09 -06:00
Justin Findlay
90819f9c37 Merge pull request #24923 from jayeshka/status-states-unit-test 
adding states/status unit test case.
 2015-06-24 09:50:07 -06:00
Jayesh Kariya
baec650674 adding states/status unit test case. 2015-06-24 17:23:13 +05:30
Ronald van Zantvoort
b8b44b63b9 Deprecation colons were lonely 
typofix
 2015-06-23 18:50:36 +02:00
Ronald van Zantvoort
33683fa992 Merge blockdev tests into disk 2015-06-23 16:52:37 +02:00
Jayesh Kariya
ef1347f2b3 adding states/ssh_known_hosts unit test case. 2015-06-23 15:53:46 +05:30
Daniel Hobley
7fb0ba0523 Fixed lint issues 2015-06-23 10:46:37 +02:00
Daniel Hobley
0a9294d384 Fixed unit tests for win_powercfg 2015-06-23 09:39:35 +02:00
Jayesh Kariya
e5d7b0de80 adding states/ssh_auth unit test case. 2015-06-22 17:29:08 +05:30
rallytime
a306216ab9 Merge branch '2015.5' into merge_forward_develop 2015-06-19 16:37:56 -06:00
Joseph Hall
d299475d34 Merge pull request #24796 from rallytime/deprecate_provider_for_driver 
Deprecate using "provider" in favor of "driver" in cloud provider files
 2015-06-19 09:43:26 -06:00
Christophe Drevet-Droguet
ed4d0646a4 unit tests for state grains: use a subdirectory for config file 
This way, there is no /tmp/grains created on test execution. And the issue
with test_absent_delete is always triggered.
Maybe we should use mocked files, but I'm not sure how to do it.
 2015-06-19 12:49:48 +02:00
Christophe Drevet-Droguet
ff5267b1b6 trying to fix jenkins error 
There are many jenkins errors on linode CentOS7. The function `saltutil.sync_grains`
does not seem to be mocked correctly on this platform.

Based on 1f5836d0bb
 2015-06-19 12:49:28 +02:00
Jayesh Kariya
98831a8cb0 adding states/splunk_search unit test case. 2015-06-19 15:15:49 +05:30
Christophe Drevet-Droguet
650fa90b97 more complete unit tests for state grains 2015-06-19 09:20:23 +02:00
Gareth J. Greenaway
e4188e1d1f Updating slack_notify tests to reflect changes. 2015-06-18 13:39:24 -07:00
Mike Place
f3b06081fc Lint win_status 2015-06-18 14:29:19 -06:00
Colton Myers
da8b637d4d Merge pull request #24804 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-18 14:12:01 -06:00
Colton Myers
ae05e70e94 Merge pull request #24802 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-06-18 14:11:58 -06:00
rallytime
1e85bb9792 Fix bugs caught by tests, and clean up some of the tests 2015-06-18 14:02:13 -06:00
twangboy
98e7e90299 Fixed test failures for Colton 2015-06-18 12:58:18 -06:00
Mike Place
558ce63b31 Skip encoding tests if unsupported 2015-06-18 12:06:10 -06:00
Mike Place
72752f53ff Fix failing zmq tests 
This is just a stopgap to prevent the ioloop from shutting down before the procs die off.
 2015-06-18 11:45:57 -06:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
 2015-06-18 11:43:11 -06:00
Justin Anderson
179ce03d93 Revert "adding states/postgres_database unit test case." 2015-06-18 10:24:11 -06:00
Mike Place
6c804f0789 Fix loader call in pyobjects 2015-06-18 09:11:45 -06:00
Chris McMacken
3025ba1ec1 Adding a couple of tests for grant_exists 2015-06-18 08:00:23 -05:00
Jayesh Kariya
e2b6214764 adding states/slack unit test case. 2015-06-18 15:47:27 +05:30
Mike Place
a407ab7c51 Merge pull request #24329 from jayeshka/postgres_database-states-unit-test 
adding states/postgres_database unit test case.
 2015-06-17 13:11:02 -06:00
Mike Place
3401f9d154 Merge pull request #24763 from cachedout/fix_lint_24590 
Lint riak
 2015-06-17 13:04:40 -06:00
Mike Place
511e24dc5f Lint riak 2015-06-17 13:03:35 -06:00
Mike Place
c3fcef0d8a Merge pull request #24590 from dmyerscough/riak-features 
Additional riak functions
 2015-06-17 13:03:19 -06:00
Mike Place
9b3ec4baa7 Merge pull request #24757 from cachedout/fix_pyobjects 
Fix loader call in pyobjects
 2015-06-17 11:59:29 -06:00
Mike Place
d877f4f775 Merge pull request #23383 from cachedout/remove_overstate 
Overstate is dead. Long live orchestrate!
 2015-06-17 11:14:52 -06:00
Mike Place
1aab1bde56 Fix loader call in pyobjects 2015-06-17 10:17:47 -06:00
Jayesh Kariya
1a4c241050 adding states/serverdensity_device unit test case. 2015-06-17 16:50:40 +05:30
Colton Myers
2ae0d7d302 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/win_file.py
 2015-06-16 15:13:53 -06:00
Grischa Meyer
68fb5af970 fixing other test 2015-06-16 14:23:58 -06:00
Grischa Meyer
ba4f262b9c fixing text for virtual support in pyobjects 2015-06-16 14:23:58 -06:00
Justin Findlay
1753234bab Merge pull request #24615 from msteed/py3-unittests-5 
py3 unittest compat
 2015-06-16 09:25:19 -06:00
Justin Findlay
eef9317c62 Merge pull request #24668 from grischa/pyobjects_honour_virtual 
enable virtual package names in pyobjects renderer
 2015-06-16 09:05:58 -06:00
Mike Place
678ce0ce55 Merge pull request #24629 from frostyslav/develop 
Add username/password support to artifactory module
 2015-06-16 09:02:39 -06:00
Jayesh Kariya
0c136fd9c2 adding states/selinux unit test case. 2015-06-16 17:11:44 +05:30
Rostyslav Fridman
18f08c5064 Fix tests for artifactory module 2015-06-16 13:02:57 +03:00
Grischa Meyer
c0c25e83b5 fixing other test 2015-06-16 11:11:04 +10:00
Grischa Meyer
2739be2059 fixing text for virtual support in pyobjects 2015-06-16 11:09:16 +10:00
Michael Steed
0a5725a67c no-op 2015-06-15 17:08:43 -06:00
Thomas S Hatch
5ee8e50c72 Merge pull request #24339 from devopsbrett/add-consul-support 
Use consul as an external pillar source. Requires python-consul
 2015-06-15 15:16:27 -06:00
Thomas S Hatch
8997d953d9 Merge pull request #24641 from garethgreenaway/more_schedule_persistence 
Changes to various schedule related functions to ensure persistence.
 2015-06-15 10:05:08 -06:00
Jayesh Kariya
54aaaa5f12 adding states/schedule unit test case. 2015-06-15 17:16:21 +05:30
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
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
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
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