valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
60,121 Commits 24 Branches 182 Tags 341 MiB
0210ef4434
Commit Graph

3204 Commits

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

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

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

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

Details
---------

In my environment::

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

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

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

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

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

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

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-24 14:07:07 +02:00
Jayesh Kariya
7d59deb3d6 adding states/file unit test case 2015-05-23 22:22:32 -06:00
Nicolas Delaby
82ee2da750 Enforce environment values to be strings. 2015-05-23 15:52:36 +02:00
Jayesh Kariya
a81a9225b8 adding states/mount unit test case 2015-05-22 14:56:56 -06:00
Justin Findlay
09de253373 Merge pull request #24024 from jayeshka/mongodb_user-states-unit-test 
adding states/mongodb_user unit test case
 2015-05-22 14:53:19 -06:00
Justin Findlay
5eb97f0973 if a charmap is not supplied, set it to the codeset 
Fixes #23221.
 2015-05-22 14:48:39 -06:00
Nicolas Delaby
1f68d2d9a9 Update test to follow new argument name 2015-05-22 18:36:50 +02:00
Nicolas Delaby
8b7ddcbbf7 Introduce check_is_running 2015-05-22 18:36:26 +02:00
Gareth J. Greenaway
a09f0b23bd Updating schedule unit tests to align with refactoring changes. 2015-05-22 09:17:53 -07:00
Nicolas Delaby
09d934b1ac Fix pull images 
add support for use-case when a pulled new-image is forced but no new images
was downloaded from the registry.
 2015-05-22 15:51:27 +02:00
Nicolas Delaby
b681f71eb3 compare images by ID not by name 
Because the name can be no longer be correct if an active tag moved to a different image.
It happens frequently when working against `latest` tag.
 2015-05-22 14:31:19 +02:00
Jayesh Kariya
f31dc921f5 resolved errors 2015-05-22 10:48:28 +05:30
Colton Myers
58aed60838 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/runners/lxc.py
 2015-05-21 11:27:52 -06:00
Justin Findlay
55c9245075 Merge pull request #24025 from jayeshka/timezone-unit-test 
adding timezone unit test case
 2015-05-21 10:50:53 -06:00
Justin Findlay
e243617659 Merge pull request #24023 from jayeshka/mongodb_database-states-unit-test 
adding states/mongodb_database unit test case
 2015-05-21 10:49:17 -06:00
Jayesh Kariya
1ec33e22a7 removed assertion error 2015-05-21 18:57:58 +05:30
Jayesh Kariya
d038b1fdbb adding states/mongodb_user unit test case 2015-05-21 17:11:46 +05:30
Jayesh Kariya
5a9ac7effb adding states/mongodb_database unit test case 2015-05-21 17:09:20 +05:30
Jayesh Kariya
05c0a985db adding states/modjk_worker unit test case 2015-05-21 17:07:01 +05:30
Jayesh Kariya
16ecb28950 adding timezone unit test case 2015-05-21 17:05:56 +05:30
Nicolas Delaby
5f8f24b655 Related to #23975 and apply same logic for ports and port_bindings 2015-05-21 09:49:21 +02:00
Nicole Thomas
b39e2d950d Merge pull request #23975 from terminalmage/fix-docker-volumes 
Check for VOLUME lines in image
 2015-05-20 13:59:04 -06:00
Erik Johnson
8ad8b527b6 Update test to mock dockerng.history 2015-05-20 13:54:20 -05:00
Colton Myers
9dbafcc051 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/tls.py
 2015-05-20 11:59:59 -06:00
Justin Findlay
b06df57e03 Merge pull request #23970 from jayeshka/system-unit-test 
adding system unit test case
 2015-05-20 11:12:57 -06:00
Justin Findlay
38d5f75756 Merge pull request #23967 from jayeshka/memcached-states-unit-test 
adding states/memcached unit test case
 2015-05-20 11:12:26 -06:00
Jayesh Kariya
89eb00815e adding system unit test case 2015-05-20 16:06:10 +05:30
Jayesh Kariya
422a96497d adding states/modjk unit test case 2015-05-20 15:31:46 +05:30
Jayesh Kariya
8ef9240e25 adding states/memcached unit test case 2015-05-20 15:30:45 +05:30
Justin Findlay
f09b80a8b5 augeas.change state now returns changes as a dict 2015-05-19 21:10:11 -06:00
Colton Myers
622bda817f Merge pull request #23893 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-19 11:23:15 -06:00
Colton Myers
ed3a71dc72 Fix scheduleadd test 2015-05-19 09:53:01 -06:00
Thomas S Hatch
e97a9c4e93 Merge pull request #23851 from ticosax/fix-volumes 
[dockerng] fix mounting
 2015-05-19 09:47:55 -06:00
rallytime
f45c7bdfca Add boilerplate unit test pieces to new dockerng_test file 
Also fixes pylint errors in original PR.

Refs #23851
 2015-05-18 13:04:14 -06:00
Colton Myers
6530a20340 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    pkg/suse/salt.changes
    salt/modules/lxc.py
    salt/modules/ps.py
    salt/states/cloud.py
 2015-05-18 11:39:43 -06:00
Justin Findlay
433f87372c Merge pull request #23863 from rahulhan/states_timezone_unit_test 
Adding states/timezone.py unit test
 2015-05-18 11:02:19 -06:00
Justin Findlay
37b3ee5421 Merge pull request #23862 from rahulhan/states_tomcat_unit_test 
Adding states/tomcat.py unit tests
 2015-05-18 11:02:10 -06:00
Justin Findlay
dde7207acb Merge pull request #23860 from rahulhan/states_test_unit_test 
Adding states/test.py unit tests
 2015-05-18 11:01:49 -06:00
Justin Findlay
3c9b8139e8 Merge pull request #23859 from rahulhan/states_sysrc_unit_test 
Adding states/sysrc.py unit tests
 2015-05-18 11:01:46 -06:00
Rahul Handay
72fcabc690 Adding states/timezone.py unit test 2015-05-18 21:25:03 +05:30
Rahul Handay
65d7752d2a Adding states/tomcat.py unit tests 2015-05-18 21:22:46 +05:30
Rahul Handay
1f4cf86500 Adding states/test.py unit tests 2015-05-18 21:18:47 +05:30
Rahul Handay
6a903b054d Adding states/sysrc.py unit tests 2015-05-18 21:04:03 +05:30
Nicolas Delaby
df48ac2b91 volumes path, on create, should be the one inside the container 
not from the host
 2015-05-18 14:30:44 +02:00
Jayesh Kariya
280abdec7c adding sysbench unit test case 2015-05-18 17:43:37 +05:30
Alexander Schwartz
f5b1734782 fixing problem in unit test 2015-05-17 17:09:35 +00:00
Alexander Schwartz
cba47f6856 make saltify to use standard boostrap procedure, therefore providing all options like master_sign_pub_file 2015-05-17 18:16:43 +02:00
Justin Findlay
a2e23fd162 Merge pull request #23716 from makinacorpus/i23713 
Correct detect service toggling
 2015-05-16 11:00:44 -06:00
Mathieu Le Marec - Pasquet
e26885d8cb lint 2015-05-16 14:21:17 +02:00
Mathieu Le Marec - Pasquet
bde7867c98 service/{dead/running} optimizations & test fixes 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-16 13:33:34 +02:00
Weilu Jia
64634b6349 Update psutil.pid_list to use psutil.pids 2015-05-15 14:25:03 -07:00
Weilu Jia
8a1da33ada Fix test cases by mocking psutil_compat 2015-05-15 14:11:12 -07:00
Weilu Jia
7d02ad4f06 Fix some of the mock names for the new API 2015-05-15 13:03:26 -07:00
Weilu Jia
93ee411fd5 Create compatability psutil. 
psutil 3.0 drops 1.0 API, but we still support old psutil versions.
 2015-05-15 13:03:25 -07:00
Colton Myers
4ea3f8f80a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/pillar/neutron.py
    salt/utils/http.py
 2015-05-15 13:43:40 -06:00
Justin Anderson
982f87316d Merge pull request #23781 from jfindlay/fix_locale_tests 
fix unit test mock errors on arch
 2015-05-15 13:40:07 -06:00
Justin Findlay
14c711eeb3 fix unit test mock errors on arch 2015-05-15 12:50:55 -06:00
Justin Findlay
aab9c431d0 Merge pull request #23777 from jfindlay/merge_23665 
Merge #23665
 2015-05-15 12:16:21 -06:00
Thomas S Hatch
348645ecd5 Merge pull request #23736 from jfindlay/fix_pip 
always load pip execution module
 2015-05-15 12:10:16 -06:00
Thomas S Hatch
d951bc8ad4 Merge pull request #22548 from terminalmage/docker-ng 
Add docker-ng state module
 2015-05-15 12:09:58 -06:00
Justin Findlay
87e000d053 fix ssh module unit tests 2015-05-15 11:11:29 -06:00
Erik Johnson
150d4e25c7 Update unit.utils.utils_test.UtilsTestCase.test_clean_kwargs 
This reflects the new behavior in which all dunder kwargs are cleaned
 2015-05-15 11:17:28 -05:00
Justin Findlay
fd8a1b797f Merge pull request #23765 from jayeshka/makeconf_states-unit-test 
adding states/makeconf unit test case
 2015-05-15 08:29:43 -06:00
Jayesh Kariya
19939cfa98 adding svn unit test case 2015-05-15 17:39:21 +05:30
Jayesh Kariya
26e31afa31 adding states/makeconf unit test case 2015-05-15 17:37:53 +05:30
Javier Domingo
63620725c3 Remove trailing whitespace 2015-05-15 13:00:11 +02:00
Justin Findlay
b8867a8c23 update pip tests 2015-05-15 00:15:26 -06:00
Javier Domingo Cansino
5cab0ecc95 ssh: AuthorizedKeysFile expands defined tokens 2015-05-15 00:45:24 +02:00
Justin Findlay
e90bb252d3 update debian_ip unit tests 
Related to 5ff749e4 (#23554).
 2015-05-14 13:45:06 -06:00
Colton Myers
7d8038f134 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    debian/changelog
    salt/modules/win_pkg.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-05-14 10:27:00 -06:00
Rahul Handay
aad27db513 Adding states/user.py unit tests 2015-05-14 21:28:37 +05:30
Justin Findlay
13facbf077 Merge pull request #23704 from jayeshka/lvs_server_states-unit-test 
adding states/lvs_server unit test case
 2015-05-14 08:22:10 -06:00
Jayesh Kariya
da323dab0b adding states/lvs_server unit test case 2015-05-14 14:54:29 +05:30
Jayesh Kariya
66717c8133 adding states/lvs_service unit test case 2015-05-14 14:53:26 +05:30
Justin Findlay
e480f13688 Merge pull request #23675 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-05-13 12:35:54 -06:00
Colton Myers
5ee7f25ee4 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-13 11:50:33 -06:00
Colton Myers
acdd3fc6bd Fix lint 2015-05-13 11:47:43 -06:00
Jayesh Kariya
17987d97f0 made changes to test_interfaces function. 2015-05-13 10:35:05 -06:00
Nicole Thomas
c1bdd4d377 Merge pull request #23651 from jayeshka/solr-unit-test 
adding solr unit test case
 2015-05-13 09:26:15 -06:00
Nicole Thomas
ee43411677 Merge pull request #23649 from jayeshka/libvirt_states-unit-test 
adding states/libvirt unit test case
 2015-05-13 09:24:48 -06:00
Nicole Thomas
c7fc466f1e Merge pull request #23648 from jayeshka/linux_acl_states-unit-test 
adding states/linux_acl unit test case
 2015-05-13 09:24:11 -06:00
Jayesh Kariya
3f0ab29eb0 removed error. 2015-05-13 18:02:35 +05:30
Jayesh Kariya
6e05148962 adding solr unit test case 2015-05-13 17:14:53 +05:30
Jayesh Kariya
11081c121c adding states/linux_acl unit test case 2015-05-13 17:12:28 +05:30
Jayesh Kariya
0fb923a283 adding states/libvirt unit test case 2015-05-13 17:11:09 +05:30
Jayesh Kariya
1987015033 adding states/kmod unit test case 2015-05-13 17:09:57 +05:30
Jayesh Kariya
0936e1d386 made changes to test_interfaces function. 2015-05-13 11:09:40 +05:30
Colton Myers
eca368a0ee Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-12 16:09:12 -06:00
Colton Myers
680e88f058 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/modules/ebuild.py
    tests/unit/modules/grains_test.py
 2015-05-12 16:06:36 -06:00
Justin Findlay
d4f30955fa Merge pull request #23598 from rahulhan/states_win_dns_client_unit_test 
Adding states/win_dns_client.py unit tests
 2015-05-12 15:47:36 -06:00
Justin Findlay
811c6a1d89 Merge pull request #23597 from rahulhan/states_vbox_guest_unit_test 
Adding states/vbox_guest.py unit tests
 2015-05-12 15:46:30 -06:00
Nicole Thomas
b8589532d1 Merge pull request #23603 from rahulhan/states_winrepo_unit_test 
Adding states/winrepo.py unit tests
 2015-05-12 12:40:12 -06:00
Nicole Thomas
3cbbd6d277 Merge pull request #23602 from rahulhan/states_win_path_unit_test 
Adding states/win_path.py unit tests
 2015-05-12 12:39:37 -06:00
Nicole Thomas
3c904e8739 Merge pull request #23600 from rahulhan/states_win_network_unit_test 
Adding states/win_network.py unit tests
 2015-05-12 12:39:01 -06:00
Rahul Handay
6a2909eeea Removed errors 2015-05-12 23:20:36 +05:30
Rahul Handay
b418404eb7 removed lint error 2015-05-12 23:06:20 +05:30
Rahul Handay
a66e7e7f1f Adding states/winrepo.py unit tests 2015-05-12 22:54:54 +05:30
Rahul Handay
122c29f71a Adding states/win_path.py unit tests 2015-05-12 22:50:02 +05:30
Rahul Handay
1be802300b Adding states/win_network.py unit tests 2015-05-12 22:45:25 +05:30
Rahul Handay
6cda890517 Adding win_firewall.py unit tests 2015-05-12 22:39:09 +05:30
Rahul Handay
d08d885828 Adding states/win_dns_client.py unit tests 2015-05-12 22:34:31 +05:30
Rahul Handay
4cde78a58a Adding states/vbox_guest.py unit tests 2015-05-12 22:31:03 +05:30
Nicole Thomas
d2f097584c Merge pull request #23583 from jayeshka/ipset_states-unit-test 
adding states/ipset unit test case
 2015-05-12 10:31:55 -06:00
Nicole Thomas
82a47e8cbf Merge pull request #23582 from jayeshka/keyboard_states-unit-test 
adding states/keyboard unit test case
 2015-05-12 10:31:17 -06:00
Nicole Thomas
77e5b28566 Merge pull request #23581 from jayeshka/layman_states-unit-test 
adding states/layman unit test case
 2015-05-12 10:30:36 -06:00