valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
55,819 Commits 24 Branches 182 Tags 341 MiB
3fe4a75a7f
Commit Graph

2854 Commits

Author SHA1 Message Date
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
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
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
Mike Place
39ef4f3209 Merge pull request #24584 from cachedout/unit_warnings 
Fix unit test warnings
 2015-06-11 20:47:59 +05:30
Jayesh Kariya
3b95744840 adding states/redismod unit test case. 2015-06-11 17:42:15 +05:30
Damian Myerscough
7ceffd4c54 Additional riak functions 2015-06-10 22:14:03 -07:00
Thomas S Hatch
5ec9d331cf Merge pull request #24124 from ticosax/mine-dockerng 
[dockerng] Migrate salt.mine to dockerng
 2015-06-10 20:15:17 -06:00
Thomas S Hatch
a570d7f967 Merge pull request #24566 from jayeshka/rdp_states-unit-test 
adding states/rdp unit test case.
 2015-06-10 20:14:39 -06:00
Thomas S Hatch
d3feedd174 Merge pull request #24557 from msteed/py3-unittests-4 
More py3 unittest fixes
 2015-06-10 20:14:14 -06:00
Thomas S Hatch
14c22e66f4 Merge pull request #24552 from joejulian/develop_dont_pollute_environment 
Don't pollute the TZ environment variable
 2015-06-10 20:13:21 -06:00
Thomas S Hatch
5df5fb002e Merge pull request #24519 from dmyerscough/riak-module 
Additional Riak features with error messages printed
 2015-06-10 20:10:29 -06:00
Thomas S Hatch
94067fdc72 Merge pull request #24511 from jquast/rabbitmq-trailing-outp-fix 
bugfix: trailing "...done" in rabbitmq output
 2015-06-10 20:09:23 -06:00
Mike Place
b3b1536afd Derp 2015-06-10 15:50:53 -06:00
Mike Place
7e153bc6a9 Fix unit test warnings 2015-06-10 15:37:01 -06:00
rallytime
c82f135d2e Disabled some flaky tests until we can figure out how to make them more reliable 2015-06-10 14:04:14 -06:00
Michael Steed
63531c2a3d fix failing unit test 
Reload the locales module to discard the memoization of get_encodings()
 2015-06-10 10:55:51 -06:00