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,640 Commits 24 Branches 182 Tags 341 MiB
a123efd4ef
Commit Graph

5802 Commits

Author SHA1 Message Date
rallytime
7b594ef6d6 Use an available image to test against 2015-08-24 15:12:19 -06:00
rallytime
5a2c8825ba Extra lines 2015-08-24 15:02:44 -06:00
rallytime
d28672b69e Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests 2015-08-24 15:01:30 -06:00
Michael Steed
79a76c5cfe fixes 
- improve unit test coverage & fix bugs exposed thereby
- lint
 2015-08-24 14:11:55 -06:00
rallytime
1401255287 Use an available image to test against 2015-08-24 11:45:28 -06:00
Erik Johnson
f033571d7e No shell needed when checking git version 2015-08-24 11:32:51 -05:00
Erik Johnson
398f779d92 Add debug logging to troubleshoot worktree test failures 2015-08-24 10:44:08 -05:00
Erik Johnson
b9b44a3434 Don't set global user.name or user.email if they already exist 2015-08-23 23:43:12 -05:00
Pedro Algarvio
2f9b40ca25 Merge pull request #26577 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-23 08:14:04 +01:00
Pedro Algarvio
965a4ba7cf Merge pull request #26581 from terminalmage/fix-tests 
Skip tests that don't work with older mock
 2015-08-23 00:06:27 +01: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
667dfcee14 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/renderers/gpg.py
    tests/integration/loader/loader.py
 2015-08-21 16:44:59 -06:00
Colton Myers
55ecff1278 Merge branch 'merge-forward-2015.8' of https://github.com/basepi/salt into basepi-merge-forward-2015.8 
Conflicts:
    salt/utils/event.py
 2015-08-21 16:37:24 -06:00
Michael Steed
186a4d052c wip: update spm for integration into raas 2015-08-21 16:20:42 -06:00
Nicole Thomas
2cd36c7ed4 Merge pull request #26565 from cachedout/fix_virtual_warnings 
Fix many errors with __virtual__ in tests
 2015-08-21 15:37:53 -06:00
Jenkins
41541e4e2b Fix many errors with __virtual__ in tests 
Also stop using __salt__ in __virtual__ which is not guaranteed to exist
 2015-08-21 14:01:03 -06:00
Erik Johnson
73537300cb Lint fixes 2015-08-21 13:48:55 -05: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
Justin Findlay
2fee5708bb Merge pull request #26501 from terminalmage/git_pillar_docs 
Update git_pillar docs, add git.list_worktrees function
 2015-08-20 23:34:02 -06: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
Erik Johnson
9a87f052d5 Update class name for old git pillar class 2015-08-20 10:39:36 -05:00
Tarjei Husøy
5289165487 Git: Don't leak https user/pw to log 2015-08-19 23:58:08 -07:00
Erik Johnson
43fef21907 Add list_worktrees tests 2015-08-19 19:09:59 -05: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
Mike Place
49eebec30a Merge pull request #26492 from cachedout/fix_schedule_test_26 
Fix schedule test error on py26
 2015-08-19 14:36:40 -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
Jenkins
9149cfbeb2 Fixing more tarfile tests on py2.6 2015-08-19 14:12:18 -06:00
Tarjei Husøy
09fc934acc Handle user-only http auth in git module 2015-08-19 11:46:30 -07:00
Mike Place
ed71476ca2 Merge pull request #26477 from cachedout/fix_26_tarfile 
Fix integration.modules.git.GitModuleTest.test_archive on py26
 2015-08-19 11:34:06 -06:00
Jenkins
dbbe206e19 Fix integration.modules.git.GitModuleTest.test_archive on py26 
Fix borrowed from: http://stackoverflow.com/questions/6086603/statement-with-and-tarfile
 2015-08-19 11:31:38 -06:00
Mike Place
4d320e0c3c Merge pull request #26469 from jtand/2015.8 
--annotate and --message aren't valid options in older versions of git.
 2015-08-19 11:25:21 -06:00
justinta89
c542895bd2 --annotate and --message aren't valid options in older versions of git. 2015-08-19 09:09:34 -06:00
Colton Myers
bf6c7e82cc Keep the formatted assertMsg 2015-08-18 12:50:24 -06:00
Colton Myers
f6481a1fb3 Merge pull request #26410 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-18 11:52:13 -06:00
Erik Johnson
5d969116ad Merge pull request #26427 from alprs/fix-git_latest_no_rev_concat 
git.latest with no rev: fix concatenation error (NoneType and str)
 2015-08-18 12:27:49 -05: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
Andreas Lutro
2f55d60293 git.latest: add test for no rev 
technically, rename existing test and add a new simpler test with the
old name.
 2015-08-18 16:38:24 +02: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
b7447fcadb Fix git.clone tests to reflect new return data 2015-08-18 03:39:27 -05:00
Erik Johnson
8dc8eb4b41 Fix test_add_dir 
Paths in the expected output needed to be relative, not full
 2015-08-18 02:40:25 -05:00
Erik Johnson
7c9f2027f6 Remove usage of os.chdir except in setUp 
Additionally, take measures to ensure that we chdir back to the original
cwd at the conclusion of the test.

A redundant test has also been removed, was likely a stray copypasta.
 2015-08-18 02:15:21 -05:00
Erik Johnson
dd9bcc896e Lint fixes 2015-08-17 22:10:39 -05: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
294aad298e Add proper tests for git execution module 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
Mike Place
35d6ae2be7 Use with 2015-08-12 12:14:12 -06:00
Nitin Madhok
d94485d336 Fix permission on tests/runtests.py on 2015.5 branch 2015-08-12 13:04:17 -04: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
Andreas Lutro
ceda2b7274 users: integration test for empty GECOS fields 2015-08-07 09:25:21 +02: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
Mike Place
fb4744b2f8 Merge pull request #25710 from jahamn/integration-test-for-issue-25250 
Integration Testcase for Issue 25250
 2015-07-24 14:57:33 -06:00
Jason Hamner
24f653e963 Integration Test for Issue 25250 
Adds integration test for #25250
 2015-07-24 13:28:15 -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
Justin Findlay
5c94fe3ad3 Merge pull request #25599 from jfindlay/tcp_test 
fix transport settings in #25596
 2015-07-21 17:43:45 -06:00
Justin Findlay
146e6e519a fix transport settings in 3083c71 2015-07-21 16:42:33 -06:00
Mike Place
89e0f151fa Merge pull request #25596 from jfindlay/tcp_test 
Tcp test
 2015-07-21 16:34:56 -06: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
Justin Findlay
a95353b4e3 add tcp transport to shell.key tests 2015-07-20 17:02:25 -06:00
Justin Findlay
5dadaec775 add tcp transport to jenkins and runtests 2015-07-20 16:56:00 -06:00
Justin Findlay
3083c71ec3 add tcp transport opt to test runner 2015-07-20 16:52:48 -06:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
twangboy
5008bfee96 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_21041_again 2015-07-20 12:51:43 -06:00
twangboy
8b2dc681f9 Fixed the gem module to work on windows... without injection 2015-07-20 12:50:33 -06:00
Mike Place
89d595f002 Lint config_test 2015-07-20 11:18:31 -06:00
Pedro Algarvio
7c0ad43906 Another fix for flattened properties and test cases 2015-07-17 18:24:43 +01:00
Pedro Algarvio
85b191c4b9 Test case to make sure plain string requirements have the same outcome 2015-07-17 17:58:52 +01:00
Pedro Algarvio
6b09ec0c30 Fix requirements items since they broke with the previous 2 commits. 2015-07-17 17:23:17 +01:00
Pedro Algarvio
6e1ee65421 Test case for missing required entries when flattening Schemas 2015-07-17 17:23:07 +01:00
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
Seth House
cb98d79cdd Merge pull request #25457 from jacksontj/saltnado 
Saltnado
 2015-07-15 11:50:12 -06:00
Thomas Jackson
bc32f66b98 Add runner_async endpoint to salnado 
Feature for #25427
 2015-07-15 09:07:26 -07:00
Mike Place
cfec990062 Merge pull request #25433 from jleroy/ipv6-scope-support-ifconfig 
Support for IPv6 addresses scopes in network.interfaces (ifconfig)
 2015-07-15 08:44:09 -06:00
Pedro Algarvio
c4b15840c6 Additional test case for question raised in #1846 
https://github.com/saltstack/salt/issues/1864#issuecomment-102246258
 2015-07-15 14:29:43 +01: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
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
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
Justin Findlay
576f1b8493 Merge pull request #25008 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-07-01 19:04:59 -06: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
Thomas S Hatch
c940dbcb03 Merge pull request #24984 from twangboy/win_user 
Win user
 2015-06-30 14:54:50 -06:00
Mike Place
69b9f1781c Revert zmq test experiment 2015-06-30 14:38:31 -06:00
Justin Findlay
6f238e924c integration test file.managed sources 2015-06-30 14:26:59 -06:00
Mike Place
8a5caf02c2 Change pub test to return global ioloop instance 
This *could* be causing the intermetent failures on
unit.transport.zeromq_test.AsyncPubChannelTest.test_basic but it
is a bit of a shot in the dark.
 2015-06-30 13:37:03 -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
twangboy
96bc5aed10 Fixed more testing stuff, an egregious error 2015-06-29 12:27:22 -06:00
Thomas S Hatch
900c5e2702 Merge pull request #24970 from rallytime/azure-test-fix 
Update the Azure Cloud Provider tests to be more accurate and use newe…
 2015-06-29 09:46:45 -07: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
rallytime
b68e3c0d0c Update the Azure Cloud Provider tests to be more acurate and use newer azure SDK version 2015-06-25 15:14:21 -06:00
Colton Myers
63667e0d49 Add more side effects 2015-06-25 14:08:47 -06:00
Mike Place
a71c1b7c8b Merge pull request #24966 from garethgreenaway/2015_5_24862_gpg_import_key 
Fixes to gpg.py in 2015.5
 2015-06-25 13:58:49 -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 Jackson
87adca46e0 Fix memory leak in saltnado 
Fixes #24846

If an event was checked after the request was closed out it was possible for requests to get into the event_listener's mapping and never be cleaned out. This fixes the leak by checking if the request is open or not before adding it to the mappings.
 2015-06-25 09:06:33 -07:00
Thomas Phipps
09ed674491 forgot the unit test. or at least couldn't find it originally. 2015-06-24 17:09:13 -07:00
Colton Myers
acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/utils/cloud.py
    salt/utils/job.py
 2015-06-24 11:44:04 -06:00
justinta89
bdb7a19c36 Fixed ps module to not use depreciated psutil commands 2015-06-24 11:31:07 -06:00
Mike Place
78eb91ce0b Merge pull request #24932 from cachedout/fix_grains_test 
Fix grains test
 2015-06-24 10:47:08 -06:00
Mike Place
e1069741ea Fix grains test 2015-06-24 10:46:40 -06:00
Thomas S Hatch
2a91f6f06d Merge pull request #24734 from garethgreenaway/config_changes 
Alllow configuration items using either module.key or module:key
 2015-06-24 10:46:09 -06:00
Thomas S Hatch
d82af08cd7 Merge pull request #24887 from Unity-Technologies/win-powercfg 
Fixed powercfg on windows 7
 2015-06-24 10:42:18 -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
C. R. Oldham
3cadda6fe8 Merge pull request #24867 from rallytime/fix_cloud_tests 
Clean up the Rackspace cloud tests and alias provider for driver in Openstack
 2015-06-23 10:27:04 -06: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
Damian Myerscough
e597fde260 Remove old commented out listen definition and make parser arguments PEP8 compliant 2015-06-22 21:14:56 -07:00
rallytime
e89564c775 Update Rackspace cloud test file to be more accurate 2015-06-22 10:18:52 -06:00
Jayesh Kariya
e5d7b0de80 adding states/ssh_auth unit test case. 2015-06-22 17:29:08 +05:30
Nicole Thomas
6fa7e5c5f2 Merge pull request #24833 from rallytime/fix_linode_tests 
Fix linode cloud tests
 2015-06-20 14:15:09 -06:00
rallytime
a306216ab9 Merge branch '2015.5' into merge_forward_develop 2015-06-19 16:37:56 -06:00
Justin Findlay
c69650aa5f Merge pull request #24817 from rallytime/enable_gogrid_tests 
Make the GoGrid Cloud Provider Tests work
 2015-06-19 11:14:51 -06:00
rallytime
c56d3150ec Fix linode cloud tests 2015-06-19 10:55:12 -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
rallytime
4a0626bf27 Python 3 compat fix 2015-06-18 18:42:04 -06:00
rallytime
5c137c86ad Make the GoGrid Cloud Provider Tests work 2015-06-18 17:08:57 -06: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
C. R. Oldham
1a158e8a3b Merge pull request #24792 from rallytime/bp-24757 
Back-port #24757 to 2015.5
 2015-06-18 09:58:35 -06:00
C. R. Oldham
0f9298263b Merge pull request #24768 from jfindlay/pkg_mod 
fix yum versionlock on RHEL/CentOS 5, disable corresponding test
 2015-06-18 09:13:12 -06:00
Mike Place
6c804f0789 Fix loader call in pyobjects 2015-06-18 09:11:45 -06:00
Mike Place
fd7339014b Merge pull request #24782 from jayeshka/slack-states-unit-test 
adding states/slack unit test case.
 2015-06-18 08:33:55 -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
Thomas Jackson
b1211c5422 Re-enable tests for complex prereq and prereq_in 
Since #24770 is fixed, #8211 is also fixed (since they are basically the same issue)
 2015-06-17 21:57:37 -07:00
Justin Findlay
7a26c2b5b9 disable pkg.hold test for RHEL/CentOS 5 2015-06-17 16:36:36 -06:00
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
e6dcf3ab12 Merge pull request #24703 from mattmb/fix/onchanges-and-or 
Multiple onchanges requisite behaviour
 2015-06-17 12:26:39 -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
dab4eccd00 Remove overstate tests 2015-06-17 11:14:19 -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
mattmb
a5607d5e07 Multiple onchanges requisite behaviour 
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
 2015-06-16 15:02:11 +01: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
Justin Findlay
01092c2337 Merge pull request #24628 from jayeshka/reg_states-unit-test 
adding states/reg unit test case.
 2015-06-12 11:29:11 -06:00
Jayesh Kariya
af1bd8f9ff adding states/reg unit test case. 2015-06-12 17:23:41 +05:30
Brett Mack
6ca1dbd65c Don't split multiline values into a list if wrapped inside " 
Use salt.utils.dictupdate to merge dictionaries
 2015-06-12 03:46:28 +01:00
Brett Mack
1bbaf0e9a0 More style guideline fixes 2015-06-12 03:46:28 +01:00
Brett Mack
2ce52ee95f Style changes to bring code in line with coding standards 2015-06-12 03:46:28 +01:00
Brett Mack
fed5ce8e4b Use consul as an external pillar source. Requires python-consul 2015-06-12 03:46:28 +01:00
Colton Myers
21d9df2831 Merge pull request #24606 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-11 16:57:11 -06:00
Michael Steed
5eb097e584 py3: fix tests/unit/states/cron_test.py 2015-06-11 16:26:10 -06:00
Michael Steed
846e1a2378 py3: fix tests/unit/stateconf_test.py 2015-06-11 16:20:41 -06:00
Michael Steed
ca34897d2c py3: fix salt/modules/win_status.py and tests 2015-06-11 15:39:39 -06:00
Michael Steed
e7620a2c30 py3: fix tests/unit/states/modjk_test.py 2015-06-11 15:16:17 -06:00
Michael Steed
56941f9432 rm pdb invocation :/ 2015-06-11 15:07:52 -06:00
Michael Steed
6f0da2a9a8 py3: (mostly) fix tests/unit/pydsl_test.py 
One test is still failing under python 3
 2015-06-11 15:05:30 -06:00
Justin Findlay
d88fb22fdc fix pkg module integration tests on CentOS 5 2015-06-11 14:56:52 -06:00
Nicole Thomas
22c44490b0 Merge pull request #24602 from msteed/py3-fix-ascii-arch 
Undo the memoization of contrived locale
 2015-06-11 13:55:37 -06:00
Colton Myers
725e5c689f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-11 13:15:38 -06:00
Justin Findlay
fb91b40ba0 fix pkg module integration tests on ubuntu 12 2015-06-11 12:46:22 -06:00
Michael Steed
91aeaabb7c undo the memoization of contrived locale 2015-06-11 12:13:07 -06:00
Michael Steed
4b6b4d1cad py3: fix tests/unit/pillar_test.py 
- write bytes to temp files
- work around py3 mock bug
 2015-06-11 10:33:00 -06:00
Justin Findlay
5a21ad152e Merge pull request #24593 from jayeshka/redismod_states-unit-test 
adding states/redismod unit test case.
 2015-06-11 09:55:27 -06:00
Justin Findlay
8ffb86edd0 Merge pull request #24581 from rallytime/disable_some_flaky_tests 
Disabled some flaky tests until we can figure out how to make them more reliable
 2015-06-11 09:51:41 -06:00
Mike Place
39ef4f3209 Merge pull request #24584 from cachedout/unit_warnings 
Fix unit test warnings
 2015-06-11 20:47:59 +05:30
Jayesh Kariya
3b95744840 adding states/redismod unit test case. 2015-06-11 17:42:15 +05:30
Damian Myerscough
7ceffd4c54 Additional riak functions 2015-06-10 22:14:03 -07:00
Thomas S Hatch
5ec9d331cf Merge pull request #24124 from ticosax/mine-dockerng 
[dockerng] Migrate salt.mine to dockerng
 2015-06-10 20:15:17 -06:00
Thomas S Hatch
a570d7f967 Merge pull request #24566 from jayeshka/rdp_states-unit-test 
adding states/rdp unit test case.
 2015-06-10 20:14:39 -06:00
Thomas S Hatch
d3feedd174 Merge pull request #24557 from msteed/py3-unittests-4 
More py3 unittest fixes
 2015-06-10 20:14:14 -06:00
Thomas S Hatch
14c22e66f4 Merge pull request #24552 from joejulian/develop_dont_pollute_environment 
Don't pollute the TZ environment variable
 2015-06-10 20:13:21 -06:00
Thomas S Hatch
5df5fb002e Merge pull request #24519 from dmyerscough/riak-module 
Additional Riak features with error messages printed
 2015-06-10 20:10:29 -06:00
Thomas S Hatch
94067fdc72 Merge pull request #24511 from jquast/rabbitmq-trailing-outp-fix 
bugfix: trailing "...done" in rabbitmq output
 2015-06-10 20:09:23 -06:00
Mike Place
b3b1536afd Derp 2015-06-10 15:50:53 -06:00
Mike Place
7e153bc6a9 Fix unit test warnings 2015-06-10 15:37:01 -06:00
rallytime
c82f135d2e Disabled some flaky tests until we can figure out how to make them more reliable 2015-06-10 14:04:14 -06:00
Michael Steed
63531c2a3d fix failing unit test 
Reload the locales module to discard the memoization of get_encodings()
 2015-06-10 10:55:51 -06:00
Jayesh Kariya
273b994e91 adding states/rdp unit test case. 2015-06-10 18:41:29 +05:30
Nicolas Delaby
1e8e082f40 Migrate salt.mine to dockerng 2015-06-10 08:59:03 +02:00
Damian Myerscough
a8254f1602 Fixing pylint errors 2015-06-09 22:29:44 -07:00
Damian Myerscough
59e04d163c Fixing unittests for new functionality 2015-06-09 20:52:41 -07:00
Jeff Quast
a154280b34 bugfix: trailing "...done" in rabbitmq output 
Problem
-----------

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

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

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

Details
---------

In my environment::

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

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

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

in virt_test.py, don't rely on the py2 behavior of str/int comparison,
and don't rely on dict.keys() being indexable.
 2015-06-09 13:06:44 -06:00
Michael Steed
0543f9aa0d fix tests/unit/modules/network_test.py 
Explicitly test salt.ext.ipaddress in test_is_private() and
test_is_loopback() as originally intended.
 2015-06-09 12:13:04 -06:00
Michael Steed
8669dacaf1 likewise in test_render_with_utf8_syntax_error() 2015-06-09 11:48:13 -06:00
Michael Steed
4b34b60623 set encoding in test_render_with_unicode_syntax_error() 2015-06-09 11:43:23 -06:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
 2015-06-09 11:41:07 -06:00
Michael Steed
ce5f14bb0e set encoding in test__unicode_match() 2015-06-09 11:19:51 -06:00
Michael Steed
f85a3e39da specify encoding in test_to_str() 2015-06-09 11:13:19 -06:00
Michael Steed
cb2985732d py3: fix salt/crypt.py 
- Open key files in binary mode since the PyCrypto key import/export
  routines use bytes
- Add unit tests for the easy stuff not covered elsewhere
 2015-06-09 10:19:06 -06:00