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
61,746 Commits 24 Branches 182 Tags 341 MiB
033bef2ed2
Commit Graph

3282 Commits

Author SHA1 Message Date
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
Justin Findlay
5ce61abf57 rewrite GPG unit tests 2015-11-16 09:36:29 -07:00
Justin Findlay
e32a9aab85 rh_service._chkconfig_is_enabled unit tests 2015-11-13 23:38:40 -07:00
Todd Tomkinson
ba94878f45 marathon and chronos proxy minions 2015-11-12 10:03:38 -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
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
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
5293150d25 Fix tests 2015-11-05 08:29:55 -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
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
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
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
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
rallytime
95defb87c5 Add test for availability_zone check to boto_vpc_tests 2015-10-26 10:15:29 -04:00
Justin Findlay
0dc72135de update blockdev exec and state module unit tests 2015-10-23 18:12:43 -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
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
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
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
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
36f05fb526 Merge pull request #27882 from twangboy/win_task_module 
Created win_task.py module
 2015-10-13 10:54:13 -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
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
Eren Güven
2caf1d21d6 fix test 2015-10-08 14:57:33 +02:00
Nicolas Delaby
821ed72f37 pass filters argument to dockerng.ps 2015-10-07 15:06:16 +02:00
Nicolas Delaby
edf625c8b4 Add support of labels parameter for dockerng 2015-10-06 13:18:05 +02: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
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
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
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
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
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
twangboy
7992b7e20a Fixed some tests... hopefully... 2015-09-15 16:27:47 -06: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
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
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
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
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
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
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
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
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
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
Colton Myers
64cad371f0 Remove overmocked test 2015-08-26 16:02:42 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Colton Myers
49fb19049b Remove outdated heavily-mocked unit test 2015-08-10 16:54:17 -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
e5eaf4686a Use timedatectl set-timezone to tzsetting 
Fixed #26122
 2015-08-09 06:00:35 +03: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
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
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
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
4d8ba6b874 Remove reg unit tests, not applicable to latest version of reg module 2015-08-03 12:03:03 -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
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
twangboy
a904e8329b Fixed another test failure... 2015-07-27 15:05:23 -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
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
twangboy
87c8f8dfb5 Fixed some tests... maybe... 2015-07-24 15:07:45 -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
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
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
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
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
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
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
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
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
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
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
rallytime
138c4f1e72 Remove parted deprecations and fix failing tests 2015-07-08 09:03:55 -06: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