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
87,598 Commits 24 Branches 182 Tags 341 MiB
bde3611f08
Commit Graph

11242 Commits

Author SHA1 Message Date
rallytime
281cbbe048
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/libvirt.py
  - salt/daemons/masterapi.py
  - salt/modules/file.py
  - salt/modules/yumpkg.py
  - salt/states/archive.py
  - salt/states/file.py
  - salt/utils/files.py
  - salt/utils/minions.py
 2017-09-25 09:40:18 -04:00
Alexandru Bleotu
2d2f094810 Merge branch 'develop' into dvs_states-gh 2017-09-25 11:22:45 +01:00
Heghedus Razvan
19da1000b4 test_nilrt_ip: Fix set_static_all test 
The nameservers needs to be specified only by ip address.

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2017-09-25 12:49:46 +03:00
Mike Place
68fa74e88f Merge pull request #43571 from nadvornik/raid_add 
Add missing devices to RAID array
 2017-09-24 19:54:10 -06:00
Mike Place
cae79d2020 Merge pull request #43699 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-24 19:27:17 -06:00
Alexandru Bleotu
847debab7a Fix failing storage and listdiffer tests 2017-09-22 17:50:09 -04:00
Gareth J. Greenaway
ca3f77f81e Adding test_btmp_beacon. 2017-09-22 14:24:31 -07:00
Gareth J. Greenaway
6fe02e3c6c Updating btmp & wtmp beacons to work with python3. Adding ability to fire alerts for specific users & specific times. Adding some unit tests for both. 2017-09-22 14:24:31 -07:00
Silvio Moioli
d53550de35 process_count_max: add unit test 2017-09-22 21:57:04 +02:00
Silvio Moioli
04ab9a6102 process_count_max: adapt existing unit tests 2017-09-22 21:57:04 +02:00
Mike Place
3ad43a5a67 Merge pull request #43470 from alexbleotu/esxdatacenter-gh 
Fix to esxdatacenter proxy
 2017-09-22 13:18:54 -06:00
Mike Place
71fa000b15 Merge branch 'develop' into ssh_known_hosts_improvements 2017-09-22 13:17:23 -06:00
rallytime
03ce4d81b7
Reactor Test: Fix incorrect merge conflict resolution 2017-09-22 15:01:11 -04:00
Alexandru Bleotu
3c7c202216 Fixed assert_has_calls in vmware.utils.dvs tests 2017-09-22 14:35:21 -04:00
Alexandru Bleotu
f811523e80 pylint 2017-09-22 14:35:14 -04:00
Alexandru Bleotu
d4d6ad99c2 Added tests for salt.utils.vmware.remove_dvportgroup 2017-09-22 14:31:48 -04:00
Alexandru Bleotu
d7474f8d30 Added tests for salt.utils.vmware.update_dvportgroup 2017-09-22 14:31:46 -04:00
Alexandru Bleotu
8a84f27adf Added tests for salt.utils.vmware.create_dvportgroup 2017-09-22 14:31:41 -04:00
Alexandru Bleotu
b8bc8fd581 Added tests for salt.utils.vmware.get_uplink_dvportgroup 2017-09-22 14:31:34 -04:00
Alexandru Bleotu
82f6ae3688 Added tests for salt.utils.vmware.get_dvportgroups 2017-09-22 14:31:29 -04:00
Alexandru Bleotu
aa247b43b8 Added tests for salt.utils.vmware.set_dvs_network_resource_management_enabled 2017-09-22 14:31:24 -04:00
Alexandru Bleotu
f211874462 Added tests for salt.utils.vmware.update_dvs 2017-09-22 14:31:19 -04:00
Alexandru Bleotu
d31d98c2d3 Added tests for salt.utils.vmware.create_dvs 2017-09-22 14:31:14 -04:00
Alexandru Bleotu
4f09bf5e88 Added tests for salt.utils.vmware.get_network_folder 2017-09-22 14:31:08 -04:00
Alexandru Bleotu
3584a91692 Added tests for salt.utils.vmware.get_dvss 2017-09-22 14:31:03 -04:00
Alexandru Bleotu
173a697be2 Added comments and imports for dvs functions in salt.utils.vmware 2017-09-22 14:31:01 -04:00
Mike Place
75dd97ee50 Merge pull request #43645 from alexbleotu/cluster_states-gh 
VMware cluster states + dependencies
 2017-09-22 11:46:25 -06:00
rallytime
cbae45bec4
Lint: Remove extra line at end of file 2017-09-22 10:33:10 -04:00
rallytime
e0ae50e489
Merge branch '2017.7' into 'develop' 
Conflicts:
  - pkg/salt.bash
  - salt/client/mixins.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/boto_vpc.py
  - salt/modules/win_pkg.py
  - salt/utils/reactor.py
  - tests/unit/utils/test_reactor.py
 2017-09-22 10:24:04 -04:00
rallytime
fca4e5563a
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/utils/test_parsers.py
 2017-09-22 09:40:03 -04:00
Mike Place
e6dc4d64df Merge pull request #43314 from twangboy/win_fix_unit.utils.test_verify 
Fix `unit.utils.test_verify` for Windows
 2017-09-21 16:26:12 -06:00
Mike Place
426eb92474 Merge branch 'develop' into raid_add 2017-09-21 15:37:31 -06:00
Mike Place
ed22e0f2fd Merge pull request #43507 from rallytime/replace-utils-calls 
Update which and is_windows calls to use new paths
 2017-09-21 14:11:21 -06:00
Vladimir Nadvornik
1c006db2a6 Fix and extend mdadm unit tests 2017-09-21 17:46:15 +02:00
Nicole Thomas
f66eb1c5ad Merge pull request #43588 from gtmanfred/do 
digitalocean should be one word.
 2017-09-21 09:25:38 -04:00
Daniel Wallace
2f3be5785b
there were more 2017-09-20 15:55:37 -06:00
Nicole Thomas
d02953ce6a Merge pull request #43235 from brejoc/improve-async-operation-handling-in-kubernetes-module 
Improve delete_deployment handling
 2017-09-20 17:33:32 -04:00
Alexandru Bleotu
23f58c0ff3 Even more pylint 2017-09-20 17:07:17 -04:00
Alexandru Bleotu
a41b5072da more pylint 2017-09-20 13:40:36 -04:00
Daniel Wallace
f54ddae6bb
fix do test where space was seperated by a newline 2017-09-20 09:57:57 -06:00
Jochen Breuer
96f39a420b Fixed linting 
Fix for "String format call with un-indexed curly braces".
 2017-09-20 16:35:01 +02:00
Alexandru Bleotu
8cdaf01642 pylint 2017-09-20 09:40:22 -04:00
Alexandru Bleotu
4f4db431fa Fixed tests for the ignore_unset_values change 2017-09-20 09:40:20 -04:00
Jochen Breuer
08fba98735 Fixed several issues with the test 
* Removed redundant import.
* No longer inheriting from LogSettingsParserTests.
* Replaced test class description with somethin meaninful.
* Fixed identation.

I've also moved the class to the bottom, since all the classes inheriting
from LogSettingsParserTests are in the block above.
 2017-09-20 15:37:24 +02:00
Jochen Breuer
3a089e450f Added tests for pid-file deletion in DaemonMixIn 
This is a follow up on this PR:
https://github.com/saltstack/salt/pull/43366

Since we can get an OSError durin PIDfile deletion with non-root users, it
would make sense to also test for this. So here are the two test cases.
One with an OSError and the other one without.
 2017-09-20 14:34:30 +02:00
Alexandru Bleotu
14deb25379 Added tests for salt.utils.vmware.assign_license 2017-09-20 06:28:51 -04:00
Alexandru Bleotu
e0ae5ecd83 Added tests for salt.utils.vmware.get_assigned_licenses 2017-09-20 06:28:47 -04:00
Alexandru Bleotu
ca33adcee7 Added tests for salt.utils.vmware.add_license 2017-09-20 06:28:44 -04:00
Alexandru Bleotu
e660af495b Added tests for salt.utils.vmware.get_licenses 2017-09-20 06:28:40 -04:00
Alexandru Bleotu
e844dbceeb Added tests for salt.utils.vmware.get_license_assignment_manager 2017-09-20 06:28:37 -04:00
Alexandru Bleotu
9f566fbe9c Added tests for salt.utils.vmware.get_license_manager 2017-09-20 06:28:33 -04:00
Alexandru Bleotu
71b10b81f9 Added tests for salt.modules.vspere.rename_datastore 2017-09-20 06:28:26 -04:00
Alexandru Bleotu
643f38c98c Added tests for salt.utils.vmware.rename_datastore 2017-09-20 06:28:21 -04:00
Alexandru Bleotu
51e881e5cf Added tests for salt.utils.vmware.get_datastores 2017-09-20 06:28:18 -04:00
Alexandru Bleotu
457246a871 Added tests for salt.utils.vmware.get_storage_system 2017-09-20 06:28:14 -04:00
Alexandru Bleotu
f042334584 Added tests for list_diff 2017-09-20 06:28:03 -04:00
Alexandru Bleotu
81a02f49e8 Added tests for RecursiveDictDiffer 2017-09-20 06:28:00 -04:00
Alexandru Bleotu
0db8cbaa25 Added tests for utils.vsan._wait_for_tasks 2017-09-20 06:24:16 -04:00
Alexandru Bleotu
6a86104ec8 Added tests for salt.utils.vsan.reconfigure_cluster_vsan 2017-09-20 06:24:11 -04:00
Mike Place
56a8257558 Merge branch 'develop' into fix-nacl-decrypt 2017-09-19 18:15:43 -06:00
Mike Place
99c6375d9a Merge branch 'develop' into ssh_known_hosts_improvements 2017-09-19 18:13:20 -06:00
Mike Place
5531e2f738 Merge pull request #43489 from garethgreenaway/41510_mount_opts 
Fix to mount state when options are removed
 2017-09-19 18:10:47 -06:00
Daniel Wallace
f84b50a06b
results and columns are lists for mysql returns 2017-09-19 15:08:17 -06:00
Daniel Wallace
3bae894306
digitalocean should be one word. 
Everything on their webpage is a reference to DigitalOcean
 2017-09-19 12:47:16 -06:00
Petr Michalec
ad05cc5d98
Fix names of NACL dec. methods 2017-09-19 15:46:12 +02:00
Jochen Breuer
d1b5ec098c Merge branch '2017.7' into improve-async-operation-handling-in-kubernetes-module 2017-09-19 10:44:31 +02:00
Alexei Pope Lane
ad80801d0f Improvements to SSH known_hosts module and state. 2017-09-19 13:28:48 +10:00
Alexandru Bleotu
eca796c7ad Merge branch 'develop' into esxdatacenter-gh 2017-09-16 18:00:42 +01:00
Alexandru Bleotu
55e0092519 Merge branch 'develop' into list_cluster-gh 2017-09-16 18:00:18 +01:00
Yagnik
2ccabe296e Add support for encrypted tag 2017-09-16 00:44:38 -04:00
garethgreenaway
e870ca1ef4 Merge branch 'develop' into 41510_mount_opts 2017-09-15 16:19:09 -07:00
Nicole Thomas
9a66d5cebc Merge pull request #43495 from rallytime/move_arg_utils 
Move 2 arg-related utility functions into salt.utils.args.py
 2017-09-15 17:29:10 -04:00
rallytime
9afc84091d Update which and is_windows calls to use new paths 2017-09-15 17:27:02 -04:00
garethgreenaway
2c091ecaae Merge branch 'develop' into 41510_mount_opts 2017-09-15 12:44:31 -07:00
Alexandru Bleotu
f1bbb84efc Merge branch 'develop' into esxdatacenter-gh 2017-09-15 20:05:03 +01:00
Alexandru Bleotu
d9b5424aab Merge branch 'develop' into list_cluster-gh 2017-09-15 20:04:33 +01:00
Mike Place
a1b871304b Merge pull request #43345 from ribx/develop 
better atom extraction from portage version string
 2017-09-15 12:29:25 -06:00
Mike Place
b262695301 Merge pull request #43493 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-15 12:23:09 -06:00
garethgreenaway
787f141504 Merge branch 'develop' into 41510_mount_opts 2017-09-15 08:43:06 -07:00
Alexandru Bleotu
4421744882 pylint on own code 2017-09-14 16:22:31 -04:00
Erik Johnson
792cc0eb54 Merge pull request #43203 from rallytime/fix-21969 
Return a SaltInvocationError when passing incorrect function pattern for wheel/runner functions.
 2017-09-14 12:17:48 -05:00
Alexandru Bleotu
d9d78fa35c Added missing decorators in utils.vmware tests 2017-09-14 12:47:55 -04:00
Alexandru Bleotu
caf9a0578b Added tests for utils.vmware.get_service_info 2017-09-14 12:47:53 -04:00
Alexandru Bleotu
2c3b4434f8 Added tests for utils.vsan.get_cluster_vsan_info 2017-09-14 12:47:48 -04:00
Alexandru Bleotu
e811eb9c85 Added tests for utils.vsan.get_vsan_cluster_config_system 2017-09-14 12:47:44 -04:00
Alexandru Bleotu
a2f84e6f39 Added tests for utils.vsan.vsan_supported 2017-09-14 12:47:41 -04:00
Alexandru Bleotu
c3d6af502b Added tests for modules.vsphere.list_cluster 2017-09-14 12:47:34 -04:00
rallytime
75abf0a2a9 Test fix: update mock util path 2017-09-14 11:01:06 -04:00
Alexandru Bleotu
15a2499d27 Added tests for salt.vsphere._get_proxy_target 2017-09-14 10:52:28 -04:00
Nicole Thomas
aee52a20e0 Lint: Add empty line at end of file 2017-09-14 09:48:09 -04:00
Robin Lutz
e1428dec5f corrected some PEP8 problems reported by jenkins 2017-09-14 14:24:54 +02:00
rallytime
acb98bbce2 Move salt.utils.argspec_report to salt.utils.args.py 2017-09-13 18:12:52 -04:00
rallytime
9df868930a Move salt.utils.arg_lookup to salt.utils.args.py 2017-09-13 17:37:49 -04:00
Nicole Thomas
f8ef7dce40 Merge pull request #43469 from alexbleotu/test_fixes-gh 
Fixed several tests
 2017-09-13 15:53:53 -04:00
rallytime
bfcfcd75e8 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
  - salt/minion.py
  - salt/modules/alternatives.py
  - salt/modules/genesis.py
  - tests/unit/modules/test_hosts.py
  - tests/unit/modules/test_ini_manage.py
 2017-09-13 15:15:04 -04:00
garethgreenaway
892d459f01 Merge branch 'develop' into 41510_mount_opts 2017-09-13 12:01:42 -07:00
Nicole Thomas
9ada7f626c Merge branch '2017.7' into win_fix_unit.utils.test_verify 2017-09-13 14:22:38 -04:00
Nicole Thomas
d2b13ce4c0 Merge pull request #43468 from terminalmage/git-configparser 
Fix unicode handling on PR #43378
 2017-09-13 13:57:17 -04:00
Gareth J. Greenaway
132b56d785 Updating mount to allow opts in the state file to be removed and have the volume remounted 2017-09-13 10:30:15 -07:00
Alexandru Bleotu
bf3785739e Fixed failing config.test_api tests for when the ROOT_DIR is / 2017-09-13 13:01:15 -04:00
Erik Johnson
4243a2211d Rewrite the reactor unit tests 
These have been skipped for a while now because they didn't work
correctly. The old tests have been scrapped in favor of new ones that
test both the old and new config schema.
 2017-09-13 10:35:23 -05:00
Alexandru Bleotu
449dccdaa1 pylint 2017-09-13 05:13:01 -04:00
Alexandru Bleotu
b861d5e85e pylint 2017-09-13 05:06:58 -04:00
Alexandru Bleotu
0222a5a056 Fix to vsphere tests 2017-09-12 18:43:08 -04:00
Alexandru Bleotu
afa4921d37 Fixed vsphere tests to support the esxcluster proxy 2017-09-12 18:43:05 -04:00
Alexandru Bleotu
26710fa8fc Added tests for esxcluster execution module 2017-09-12 18:42:58 -04:00
Alexandru Bleotu
4113aa3ca7 Added tests for esxcluster proxy 2017-09-12 18:42:53 -04:00
Alexandru Bleotu
0e7b8e0c92 Adjusted tests for esxdatacenter proxy 2017-09-12 18:37:04 -04:00
Alexandru Bleotu
71c5725008 Merge branch 'develop' into test_fixes-gh 2017-09-12 23:31:37 +01:00
Alexandru Bleotu
f11a618274 Fixed Linux sysctl tests to be run in a local environment 2017-09-12 18:27:28 -04:00
Alexandru Bleotu
5c3dd00692 Updated config.test_api tests to take into account a ROOT_DIR override 2017-09-12 18:27:26 -04:00
Alexandru Bleotu
4cadfdcb56 Updated kubernetes tests to be skipped if library is not loaded 2017-09-12 18:27:23 -04:00
Erik Johnson
575ce9eb73 Fix unicode handling on PR 43378 
The strings passed to exceptions should not be unicode types, as this
can cause problems elsewhere when exception class instances are
referenced.
 2017-09-12 16:37:15 -05:00
Nicole Thomas
1016f585f5 Merge pull request #43378 from terminalmage/git-configparser 
Add a GitConfigParser class for manipulating git config files
 2017-09-12 17:10:43 -04:00
Mike Place
68d2558988 Merge pull request #43096 from lyft/add-util-func-for-state-return-merging 
Add utils function to merge state returns
 2017-09-12 11:02:14 -06:00
Mike Place
87ffd3f105 Merge pull request #42103 from davidjoliver86/ssh-config-roster 
ssh config roster for salt-ssh
 2017-09-12 10:38:49 -06:00
Erik Johnson
626129f5a3 Import all of configparser into module for easier access to error classes 2017-09-12 11:37:13 -05:00
Erik Johnson
507c1b871e Add a GitConfigParser class for manipulating git config files 
This class is designed to be used for (among other things) gitfs and git_pillar, to enforce config settings which reside in a git config file without resorting to using the git CLI.
 2017-09-12 11:37:13 -05:00
Mike Place
1a81663e46 Merge pull request #43302 from lyft/upstream-boto_cloudfront 
Upstream boto_cloudfront execution and state modules
 2017-09-12 10:10:20 -06:00
Olivier Mauras
139e065ce9 New pillar/master_tops saltclass module 2017-09-12 15:53:39 +02:00
ribx
b712f971f7 Merge branch 'develop' into develop 2017-09-12 11:49:29 +02:00
Aneesh Agrawal
2e9f1999f6 Upstream boto_cloudfront execution and state modules 
AWS recently added support for tagging CloudFront distributions,
which allows us to start managing them via Salt
as we can insert a Salt-controlled identifier as a `Name` tag.
(CloudFront distributions get unique IDs generated by AWS,
which we can't predict and thus use to manage them idempotently.)
 2017-09-11 23:36:31 +00:00
Mike Place
08d102c869 Merge pull request #41943 from twangboy/win_unit_test_local_cache 
Fix `unit.returners.test_local_cache` for Windows
 2017-09-11 15:34:02 -06:00
Mike Place
50ab79f0cb Merge pull request #43424 from twangboy/win_unit_test_hosts 
Fix `unit.modules.test_hosts` for Windows
 2017-09-11 15:28:41 -06:00
Mike Place
2ac185b055 Merge pull request #43439 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-11 15:18:40 -06:00
Mike Place
2c28156b89 Merge pull request #41619 from skizunov/develop2 
Add ability to set minion ID by module
 2017-09-11 15:16:50 -06:00
Mike Place
bb8bffde1a Merge pull request #42915 from garethgreenaway/missing_minions_branch 
Show missing minions in lists & nodegroups
 2017-09-11 13:38:55 -06:00
Mike Place
da16b6670a Merge pull request #42752 from skizunov/develop4 
Add config option to ensure jid is unique
 2017-09-11 13:38:30 -06:00
Mike Place
9b60cc0d1f Merge pull request #43137 from aogier/x-no-grains-on-jenkins 
system group creation integration test
 2017-09-11 13:09:36 -06:00
Mike Place
0e42e8f9cc Merge pull request #43188 from alexbleotu/ext_pillar_config_param-gh 
Ext pillar config param gh
 2017-09-11 12:58:01 -06:00
Mike Place
e7a411c7f4 Merge pull request #43252 from rallytime/utils-files-moves 
Move salt.utils.istextfile to salt.utils.files.is_text_file
 2017-09-11 12:42:40 -06:00
rallytime
5413a5337e Lint: remove unused import 2017-09-11 14:34:20 -04:00
Mike Place
ca091bc8a4 Merge pull request #43438 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-11 12:33:38 -06:00
twangboy
c0dc3f73ef Use sys.platform instead of salt.utils to detect Windows 2017-09-11 12:22:06 -06:00
twangboy
e496d28cbf Fix unit.utils.test_verify for Windows 
Use Windows api to get and set the maxstdio
Change messages to work with Windows
 2017-09-11 12:22:06 -06:00
Mike Place
a9592dd3e2 Merge pull request #43320 from twangboy/win_fix_alternatives 
Fix `unit.modules.test_alternatives` for Windows
 2017-09-11 11:27:59 -06:00
Mike Place
9b89e49846 Merge pull request #43363 from twangboy/scratch_ini_tests 
Fix `unit.modules.test_ini_manage` for Windows
 2017-09-11 11:10:30 -06:00
rallytime
984fa35062 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/key.py
  - salt/modules/mount.py
  - salt/modules/system.py
  - tests/unit/modules/test_mount.py
  - tests/unit/modules/test_pam.py
  - tests/unit/modules/test_parted.py
 2017-09-11 12:55:39 -04:00
Mike Place
2964707e5d Merge pull request #43341 from ixs/fedora-rh_ip 
Fix rh_ip template use for Fedora
 2017-09-11 10:30:53 -06:00
rallytime
ef7b4242c3 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-11 12:24:10 -04:00
Mike Place
9f421dde89 Merge pull request #43370 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-11 09:38:20 -06:00
Mike Place
e89e23a32e Merge pull request #43422 from twangboy/win_unit_cloud_ec2 
Fix `unit.cloud.clouds.test_ec2` for Windows
 2017-09-11 09:17:19 -06:00
rallytime
e11aa7e5ef Adjust test mocking to handle __utils__['files.is_text_file'] 2017-09-11 10:25:00 -04:00
rallytime
1279556873 Move salt.utils.istextfile to salt.utils.files.is_text_file 
Moves the original function to `salt.utils.files.py`, adds a deprecation
warning to the original function, and updates all of the istextfile
references in salt code.
 2017-09-11 10:21:43 -04:00
Alexandru Bleotu
0882fed61a Merge branch 'develop' into ext_pillar_config_param-gh 2017-09-10 18:46:57 +01:00
twangboy
90dcf8287c Fix unit.modules.test_hosts for Windows 
Fix problem with TmpStringIO Class on Windows. The module uses this
class twice in normal operation. In Windows there's an additional run
before the real runs where it is opened with mode='w'. This causes the
data to be wiped out. So, this sets it to only save the value in the
instance to data if it is not empty.

Use the windows path to the hosts file in Windows
 2017-09-08 17:21:01 -06:00
twangboy
b2cea18d13 Fix unit.modules.test_gem for Windows 
Mock `salt.utils.is_windows` to return False so the test will run on
Windows
 2017-09-08 15:53:07 -06:00
twangboy
1379627334 Fix unit.cloud.clouds.test_ec2 for Windows 
Mock instead of create tempfile
 2017-09-08 15:36:52 -06:00
Alessandro -oggei- Ogier
496f14a7e7 forgot to mock the proper one 2017-09-08 21:37:09 +02:00
Nicole Thomas
97f05ff603 Merge pull request #43398 from twangboy/win_fix_test_mount 
Fix `unit.modules.test_mount` for Windows
 2017-09-08 09:39:28 -04:00
Nicole Thomas
6a4cc5c1b0 Merge pull request #43399 from twangboy/win_fix_test_pam 
Fix `unit.modules.test_pam` for Windows
 2017-09-08 09:37:49 -04:00
Nicole Thomas
2b5cfae3f8 Merge pull request #43400 from twangboy/win_unit_test_parted 
Fix `unit.modules.test_parted` for Windows
 2017-09-08 09:36:59 -04:00
Nicole Thomas
332deeb013 Merge pull request #43401 from twangboy/win_unit_test_pw_group 
Fix `unit.modules.test_pw_group` for Windows
 2017-09-08 09:35:44 -04:00
Nicole Thomas
c0f54bfef1 Merge pull request #43402 from twangboy/win_unit_test_qemu_nbd 
Fix `unit.modules.test_qemu_nbd` for Windows
 2017-09-08 09:34:57 -04:00
Alessandro -oggei- Ogier
8d79ee2d49 test system group creation 2017-09-08 10:34:14 +02:00
Alessandro -oggei- Ogier
70642e495d better qemu_static parameter mangle in deboostrap management, tests 2017-09-08 10:17:32 +02:00
twangboy
6ceb895a84 Use os.path.join for paths 2017-09-07 16:51:10 -06:00
twangboy
531ce8022b Fix unit.modules.test_qemu_nbd for Windows 
Use os.sep
 2017-09-07 15:44:35 -06:00
twangboy
78e39a1b9d Fix unit.modules.test_pw_group for Windows 
Skip `test_info` and `test_getent` because they require grp which is not
available on Windows
 2017-09-07 15:34:57 -06:00
twangboy
8e3e897ee2 Fix unit.modules.test_parted for Windows 
Mock salt.utils.is_windows to be False so that the __virtual__ tests
will run
 2017-09-07 15:27:11 -06:00
twangboy
6257aa964a Fix unit.modules.test_pam for Windows 
Mocks os.path.exists
 2017-09-07 15:18:14 -06:00
twangboy
4a8d7e522c Fix tests, Use full path to salt.utils.which 2017-09-07 14:41:56 -06:00
Sergey Kizunov
88ee8ad566 Add config option id_function 
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-09-07 13:41:10 -05:00
Sergey Kizunov
3c58717c58 Add config option to ensure jid is unique 
Having a jid that is occasionally not unique (eg two processes creating
jobs at about the same time) causes problems in my usage due to
job tracking assuming unique jids. Add a config option called `unique_jid`
that will enforce unique jids, but will change the jid format by
appending an underscore and the process id.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-09-07 13:25:35 -05:00
Nicole Thomas
6106aec696 Merge pull request #43356 from gtmanfred/2016.11 
never-download got readded
 2017-09-07 13:46:04 -04:00
Nicole Thomas
3f19b247f3 Add handler.messages back in for test comparison 2017-09-07 11:51:39 -04:00
Jochen Breuer
20619b24c4
Fixed test for delete_deployment 
Due to implementation change, we need to mock the return value.
 2017-09-07 10:20:46 +02:00
twangboy
a909813fa5 Remove unused import (lint) 2017-09-06 15:56:24 -06:00
twangboy
3ef8d714cb Fix unit tests to mock salt.utils.path.readlink 2017-09-06 13:03:14 -06:00
twangboy
7c4460164b Fix alternatives for Windows 
Not sure this is necessary... I don't think alternatives is a thing in
Windows. Anyway, it uses `__salt__['file.readlink']` instead of
`os.readlink` as there is no `os.readlink` in Windows.
Modifies the tests to mock `__salt__['file.readlink']` instead of
`os.readlink`
 2017-09-06 13:03:14 -06:00
Aneesh Agrawal
60d80e7cda Add utils function to merge state returns 
This makes it possible to merge the state return
for a subresource into a main state return.
This is useful for configuring e.g. alarms to go along with a resource.
 2017-09-06 18:14:04 +00:00
Alexandru Bleotu
103ef69016 Merge branch 'develop' into ext_pillar_config_param-gh 2017-09-06 18:49:37 +01:00
Alexandru Bleotu
33feda7a5b Mocked salt.utils.args.get_function_argspec instead of inspect.getargspec in all external pillar data tests 2017-09-06 12:26:40 -04:00
Nicole Thomas
7d462d29c2 Merge branch 'develop' into expand-list_pkg-attr-parameter 2017-09-06 12:15:01 -04:00
Nicole Thomas
5111cf8bad Merge branch '2016.11' into 43086-no-member 2017-09-06 10:41:18 -04:00
rallytime
5701d54516 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/state.py
  - salt/utils/gitfs.py
 2017-09-06 09:39:27 -04:00
Andreas Thienemann
6aefa5c3f8 Update unit test to provide osmajorrelease grain. 2017-09-06 03:46:00 +02:00
twangboy
a94319a082 Make sure formatting of TEST_FILE_CONTENT matches original 2017-09-05 17:03:50 -06:00
twangboy
6263bc8983 Remove print statement 2017-09-05 16:48:58 -06:00
twangboy
79cd3831ae Fix empty value preserved test 2017-09-05 16:44:12 -06:00
twangboy
85997391f1 Is this handled the same on Linux and Windows 2017-09-05 16:32:43 -06:00
Nicole Thomas
f19274e1b4 Merge pull request #43222 from rallytime/oxygen-warnings-env 
Remove deprecation warnings for "env"
 2017-09-05 18:24:54 -04:00
Mike Place
a414325a82 Merge pull request #43070 from lyft/support-states-returning-a-list-of-comments 
Support states returning a list for ret['comment']
 2017-09-05 16:19:26 -06:00
Mike Place
f902bd8bc9 Merge pull request #43152 from garethgreenaway/adding_custom_beacons 
Adding custom beacons with beacon module
 2017-09-05 15:37:39 -06:00
rallytime
b93392dfb7 Return a SaltInvocationError when passing incorrect function pattern 
When calling an incorrectly formatted wheel or runner function, we should
be raising a SaltInvocationError with a hint to check function syntax rather
that raising an Eauth authentication error.

This PR does several things:

- Adds a dictionary error return when the function syntax passed through to
`utils.minions.CkMinions.spec_check` does not match the expected `module.function`
syntax
- Handles the return of this new dictionary error (instead of previous `False` return)
wherever the spec_check function is called. This is handled up the stack in
`master.py` and `masterapi.py`.
- Reworks the runner and wheel functions in `master.py` and `masterapi.py` to
help make those functions more DRY (see `salt.auth.check_authentication` function).
- Adds tests for all of these changes (written before the runner and wheel functions
were moved to use the new salt.auth.check_authentication function)  to help prevent
regressions.
- Fixes a couple of places where unit tests exposed potential stacktraces.
- Adjusts one previous unit test concerning the dictionary error change from spec_check
 2017-09-05 17:08:50 -04:00
Mike Place
6e1b541b46 Merge pull request #43232 from terminalmage/gitfs-inheritance 
Improve inheritance in salt.utils.gitfs
 2017-09-05 14:37:05 -06:00
Mike Place
9c57869234 Merge pull request #43276 from rallytime/utils-state-moves 
Move state-related utils to salt.utils.state.py
 2017-09-05 14:20:08 -06:00
Aneesh Agrawal
ba63920874 Support states returning a list for ret['comment'] 
Some states are complicated and multiple subparts,
or maybe cross-call into __states__ if they manage subresources.
In these cases, they will have multiple comments.
Make this more ergonomic by supporting a list of strings as the
value for ret['comment'] in state returns and documenting this.
By joining comments on newlines, it is possible to combine
single-line and multi-line comments cleanly, as opposed to e.g. commas.

The driving impetus for this is some of the boto modules.
An update to the boto_sqs module is included as an example.

Add a check that outgoing state return data has the right shape,
and add a testcase as well.
Fix the NPM state tests and the saltmod runner & wheel state functions
to comply with the prescribed format.
 2017-09-05 19:52:42 +00:00
Daniel Wallace
9911b04208 fix test 2017-09-05 13:52:02 -06:00
rallytime
ed9b45ceaa Adjust a couple more tests to handle __utils__['state.check_result'] mocking 2017-09-05 10:11:11 -04:00
Robin Lutz
ba7d00f58e use dep_getkey for atom extraction to allow non existing versions and packages, added unit test to verify behaviour 2017-09-05 09:34:54 +02:00
Silvio Moioli
130c1b1c21 Merge branch 'develop' into expand-list_pkg-attr-parameter 2017-09-04 15:36:44 +02:00
twangboy
5bd5ea042a Fix unit.modules.test_chef for Windows 
Mocks the __opts__ to contain cachedir
 2017-09-01 14:49:50 -06:00
rallytime
4322f009cf Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/auth/__init__.py
  - salt/auth/ldap.py
  - salt/grains/metadata.py
  - salt/master.py
  - salt/modules/apache.py
  - salt/modules/dockermod.py
 2017-09-01 16:37:29 -04:00
rallytime
d891433214 Adjust test mocking to handle __utils__['state.check_result'] 2017-09-01 16:09:59 -04:00
rallytime
8127bca9ed Use __utils__ where possible for moved state utils 
And update all references to new state names in salt.utils.state.py
 2017-09-01 16:09:59 -04:00
rallytime
4a86f23bf1 Move state-related utils to salt.utils.state.py 
Moves the following functions from `salt.utils` to `salt.utils.state`:
- gen_state_tag
- search_onfail_requisites
- check_onfail_requisites
- check_state_result

Original functions have a deprecation warning added and all references
in Salt code were updated to use the new function path, including moving
some unit tests.
 2017-09-01 16:09:59 -04:00
Mike Place
0e262b8c0d Merge pull request #43253 from rallytime/utils-color-moves 
Move get_colors and get_color_theme to salt.utils.color.py
 2017-09-01 12:44:40 -06:00
Mike Place
24962587bc Merge pull request #43269 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-01 12:12:36 -06:00
Silvio Moioli
3dc46212cc test_yumpkg: adapt to new supported attrs 2017-08-31 16:21:26 +02:00
Silvio Moioli
7b0a7432f4 test_zypper: adapt to new supported attrs 2017-08-31 16:21:26 +02:00
William Cannon
58eef3dc2c fixed dunder usage problem in unit test 2017-08-30 17:00:27 -05:00
Nicole Thomas
bab9a49418 Merge branch 'develop' into ext_pillar_config_param-gh 2017-08-30 17:44:41 -04:00
wcannon
c080b263d5 Merge branch 'develop' into develop 2017-08-30 15:54:57 -05:00
Nicole Thomas
479e0e06ac Merge pull request #42975 from brejoc/tests-for-kubernetes-module 
Added unit tests for Kubernetes module
 2017-08-30 16:30:15 -04:00
Nicole Thomas
ca7df1d4cf Merge pull request #43176 from terminalmage/issue42935 
docker_image states: Handle Hub images prefixed with "docker.io/"
 2017-08-30 16:08:13 -04:00
Nicole Thomas
fdad9177b5 Merge branch '2017.7' into tests-for-kubernetes-module 2017-08-30 14:47:37 -04:00
Nicole Thomas
3777b34572 Merge branch '2017.7' into win_unit_test_local_cache 2017-08-30 12:16:52 -04:00
rallytime
14f5e5e023 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/augeas_cfg.py
  - salt/modules/inspectlib/collector.py
 2017-08-30 12:16:28 -04:00
Nicole Thomas
ec1bedc646 Merge pull request #43254 from twangboy/win_fix_test_inspect_collector 
Fix `unit.modules.test_inspect_collector` on Windows
 2017-08-30 11:46:07 -04:00
Nicole Thomas
25666f88f7 Merge pull request #43251 from twangboy/win_skip_test_groupadd 
Skips `unit.modules.test_groupadd` on Windows
 2017-08-30 09:56:36 -04:00
rallytime
29a763ffcb Lint: Remove extra space 2017-08-30 09:38:39 -04:00
twangboy
cec627a60b Skip mac tests for user and group 
They use grp and pwd
 2017-08-29 16:28:12 -06:00
twangboy
b401340e6c Fix unit.modules.test_inspect_collector on Windows 
Uses os.sep instead of unix-style paths in the test
Uses salt.utils.path.islink() to detect symlinks instead of
os.path.islink(). os.path.islink() does not correctly detect symlinks in
Windows
Put grp and pwd imports inside a try/except block
 2017-08-29 15:59:08 -06:00
rallytime
26f52bd2b8 Move get_colors and get_color_theme to salt.utils.color.py 
Moves the `get_colors` and `get_color_theme` out of `salt.utils.py`
and into a new file named `salt.utils.color.py`.

This PR moves the original functions, adds a deprecation warning to
the old function paths, and updates any references to the functions
in Salt code to the new location. This includes moving a test as well.
 2017-08-29 17:33:01 -04:00
twangboy
5185071d5a Skips unit.modules.test_groupadd on Windows 
There is a test_win_groupadd modules for testing the win_groupadd module
on Windows.
 2017-08-29 14:29:50 -06:00
rallytime
26410c662f Update some salt.utils.x paths for moved util functions 
Through merge forwards, some of the old-style paths have made their
way into develop. This PR corrects some of these instances on the more
popular functions.
 2017-08-29 16:24:47 -04:00
twangboy
c956d24283 Fix is_windows detection when USERNAME missing 2017-08-29 10:16:21 -06:00
twangboy
869e8cc603 Fix unit.fileserver.test_gitfs for Windows 
Put `import pwd` in a try/except block
Set `os.environ['USERNAME']` in windows using win_functions
Add error function for `shutil.rmtree`
 2017-08-29 10:16:21 -06:00
Jochen Breuer
c227cb25ad
Skipping test on ImportError 
This most probably means that the Kubernetes client lib is not
installed.
 2017-08-29 17:12:25 +02:00
Erik Johnson
53bd3a3e23 Improve inheritance in salt.utils.gitfs 
This makes the following changes:

1. Renames the valid_providers param in GitBase to git_providers,
   allowing for a dictionary mapping provider names to their associated
   classes. This allows for alternate providers to be used with a
   GitBase subclass.
2. Renames the get_provider function to verify_provider to reduce
   confusion with git_providers.
3. Uses super() to run a parent class' dunder init instead of invoking
   the parent class directly.
 2017-08-28 21:49:42 -05:00
rallytime
375b1faa92 Remove deprecation warnings for "env" 
Removal of these deprecation warnings has no behavioral effect, as
support for "env" instead of "saltenv" in these cases has already
been removed. Only the warning text will no longer display to users.
 2017-08-28 10:37:05 -04:00
rallytime
6fad40454a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/utils/napalm.py
 2017-08-28 09:28:41 -04:00
rallytime
3911df2f4b Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-28 09:25:49 -04:00
Nicole Thomas
df18a89836 Lint: Remove unused import 2017-08-28 09:21:52 -04:00
Jochen Breuer
bd76a870ce
Dunder vars are now defined via setup_loader_modules 2017-08-28 14:17:00 +02:00
Nicole Thomas
a563a9422a Merge pull request #43201 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-25 18:56:46 -04:00
Mike Place
cfde26562b Merge pull request #42991 from DarkKnightCZ/exec-code-all-fix 
Allow cmdmod.exec_code_all to utilize cmdmod.run_all parameters
 2017-08-25 15:25:31 -06:00
Mike Place
ce04ab4286 Merge pull request #42997 from twangboy/win_fix_test_module_names 
Fix `unit.test_test_module_names` for Windows
 2017-08-25 15:19:10 -06:00
Mike Place
f16b7246e4 Merge pull request #43103 from aogier/43101-genesis-bootstrap 
genesis.bootstrap deboostrap fix
 2017-08-25 14:48:23 -06:00
rallytime
d40eba6b37 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/states/git.py
 2017-08-25 16:07:27 -04:00
Mike Place
5471f9fe0c Merge pull request #43196 from gtmanfred/2016.11 
Pin request install to version for npm tests
 2017-08-25 12:43:05 -06:00
Daniel Wallace
ccd2241777 Pin request install to version 
This fails on centos 6 because its node is too old to support the version of
hawk bumped here https://github.com/request/request/pull/2751, we can still
test the functionality.  This will pull from github, and install a specific tag
version, and we still do the uninstall using the github path.

This should be more stable.
 2017-08-25 10:23:35 -06:00
Alexandru Bleotu
dc082a2087 pylint fix and fix when calling _external_pillar_data function 2017-08-25 06:41:30 -04:00
Alexandru Bleotu
a771dd94f3 Added tests for external pillar function calls 2017-08-25 06:41:27 -04:00
Alexandru Bleotu
2090d9d32f Added tests for AsyncRemotePillar adding extra minion data from config 2017-08-25 06:41:25 -04:00
Alexandru Bleotu
5b383f0036 Added tests for RemotePillar adding extra minion data from config 2017-08-25 06:41:23 -04:00
Erik Johnson
7279f98e92 docker_image states: Handle Hub images prefixed with "docker.io/" 
On some platforms, for reason which I do not yet grok, images pulled
from the Hub are prefixed with "docker.io/". This causes the
docker_image states to fail unless the user manually adds "docker.io/"
before the image name.

This commit adds a new function called "docker.resolve_tag" which
disambiguates this variance and allows images to be specified without
the "docker.io/" prefix.

Resolves #42935.
 2017-08-25 00:06:28 -05:00
garethgreenaway
d3cb78e74e Merge branch 'develop' into adding_custom_beacons 2017-08-24 17:25:13 -07:00
Nicole Thomas
a6a327b1e5 Merge pull request #43155 from terminalmage/issue43001 
Resolve image ID during container comparison
 2017-08-24 18:09:46 -04:00
garethgreenaway
0186835ebf Fix docstring in test 2017-08-24 17:08:52 -05:00
rallytime
3d0d9110ac Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/pillar/git_pillar.py
  - salt/utils/files.py
  - salt/utils/process.py
  - tests/unit/utils/test_which.py
 2017-08-24 15:33:15 -04:00
garethgreenaway
a0bb654e46 Fixing lint issues 2017-08-24 12:09:29 -07:00
Gareth J. Greenaway
41790d4f28 Missing the test_add Beacon test. 2017-08-24 10:24:27 -07:00
Nicole Thomas
4d174746f9 Merge pull request #43049 from redmatter/add-docker-network-ipam-support 
Add docker network ipam support
 2017-08-24 12:19:16 -04:00
Nicole Thomas
5f0bdd620e Merge branch 'develop' into exec-code-all-fix 2017-08-24 12:18:36 -04:00
Alessandro -oggei- Ogier
db94f3bb1c better formatting 2017-08-24 15:07:08 +02:00
Alessandro -oggei- Ogier
e5cc667762 tests: fix a leftover and simplify some parts 2017-08-24 15:04:37 +02:00
Alessandro -oggei- Ogier
13e5997457 lint 2017-08-24 12:49:39 +02:00
Alessandro -oggei- Ogier
216ced69e5 allow comma-separated pkgs lists, quote args, test deb behaviour 2017-08-24 12:00:36 +02:00
Andy Bulford
89ac3f9092 Merge branch 'develop' into add-docker-network-ipam-support 2017-08-23 23:02:07 +01:00
rallytime
c48801095f Remove tests for old git_pillar syntax. 
These tests were testing things present in the legacy git pillar syntax
and are no longer needed. The new git pillar syntax has many more integration
tests to cover various cases.
 2017-08-23 16:49:58 -04:00
rallytime
5901b10c14 Remove deprecated Legacy Git Pillar code 2017-08-23 16:49:58 -04:00
twangboy
2722e9521d Use os.path.join to create paths 2017-08-23 14:43:44 -06:00
garethgreenaway
92bc4fa39b Merge branch 'develop' into missing_minions_branch 2017-08-23 12:56:02 -07:00
Mike Place
0f4d1dd767 Merge pull request #41662 from lordcirth/nfs-exports 
Expand module nfs3
 2017-08-23 12:19:34 -06:00
Mike Place
970003731a Merge pull request #42111 from bechtoldt/fix_ssh_auth_keys_newline 
stripping whitespaces/newlines in authorized key file lines
 2017-08-23 12:12:25 -06:00
Mike Place
ae5d3ffe99 Merge pull request #43013 from amendlik/kernelpkg-remove 
Add kernelpkg functions to remove kernel packages
 2017-08-23 11:47:58 -06:00
Erik Johnson
d5b2a0be68 Resolve image ID during container comparison 
This fixes an issue where inspecting the container returns an image ID
instead of an image name, resulting in a spurious report of a changed
image. By resolving the image down to its ID for both the existing and
new containers, we ensure we're comparing ID to ID.
 2017-08-23 12:23:33 -05:00
Mike Place
03f652159f Merge pull request #43123 from twangboy/win_fix_test_which 
Fix `unit.utils.test_which` for Windows
 2017-08-23 10:01:38 -06:00
rallytime
0eafc59f33 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/win_groupadd.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/url.py
 2017-08-23 10:07:01 -04:00
Nicole Thomas
0467a0e3bf Merge pull request #43038 from twangboy/win_unit_utils_test_url 
Fix `unit.utils.test_url` for Windows
 2017-08-23 09:35:24 -04:00
twangboy
ed97cff5f6 Fix unit.utils.test_which for Windows 
This test wasn't really written with Windows in mind. Uses PATHEXT that
actually resembles a Windows environment. The test value has the correct
path seperator for Windows.
 2017-08-22 16:59:22 -06:00
Mike Place
87c918583d Merge branch 'develop' into nfs-exports 2017-08-22 15:09:49 -06:00
Mike Place
7c68c93e93 Merge pull request #42720 from kunal-bajpai/modularise-tokens 
Modularise eauth token storage and authentication
 2017-08-22 14:10:45 -06:00
Mike Place
874dd2245a Merge pull request #41868 from yagnik/nacl_renderer 
Add support for nacl renderer for encrypted data
 2017-08-22 13:36:38 -06:00
Adam Mendlik
017eb849f1 Remove kernelpkg test assertions added in Python 3.6 2017-08-22 13:05:32 -06:00
Nicole Thomas
177a4c366a Merge pull request #42729 from DSRCorporation/features/19732_extended_ext_auth 
Allow `external_auth` limit funs/args for runner/wheel modules.
 2017-08-22 14:19:06 -04:00
Mike Place
7d52bcee46 Merge pull request #42894 from gilbsgilbs/postgres-valid-until 
Add support for PostgreSQL password expiration.
 2017-08-22 12:14:53 -06:00
Mike Place
1e1a81036c Merge pull request #42962 from twangboy/win_unit_test_doc 
Fix `unit.test_doc test` for Windows
 2017-08-22 12:06:22 -06:00
Daniel Wallace
ea9e6dfd73 Merge branch 'develop' into modularise-tokens 2017-08-22 08:49:55 -06:00
Alessandro -oggei- Ogier
42a118ff56 fixed cmd composition and unified his making across module 2017-08-22 16:25:54 +02:00
Tarjei Husøy
1a987cb948 Fix broken negation in iptables 
Introduced in 7c6ff77c and released with 2017.7.
 2017-08-22 09:43:20 -04:00
rallytime
67cdfd28ad Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/cp.py
  - salt/modules/testinframod.py
  - salt/states/jenkins.py
  - tests/unit/utils/test_find.py
 2017-08-22 09:07:26 -04:00
Dmitry Kuzmenko
7ec398eb72 Allow external_auth limit funs/args for runner/wheel modules. 
Example:
external_auth:
  pam:
    thatch:
      - '@runner':
        - 'mod.fun':
          args: ['a', 'b']
          kwargs:
            aa: bb
 2017-08-22 12:17:09 +03:00
Andy Bulford
49f4f990c3 Merge branch 'develop' into add-docker-network-ipam-support 2017-08-22 09:44:21 +01:00
Mike Place
f9b4976c02 Merge pull request #42996 from twangboy/win_fix_test_stateconf 
Fix `unit.test_stateconf` for Windows
 2017-08-21 16:43:58 -06:00
Mike Place
19fc644c9b Merge pull request #43024 from twangboy/win_unit_utils_test_find 
Fix `unit.utils.test_find` for Windows
 2017-08-21 16:38:09 -06:00
Mike Place
3940084df9 Merge branch 'develop' into postgres-valid-until 2017-08-21 16:16:18 -06:00
Mike Place
1a531169fc Merge pull request #43088 from gtmanfred/2017.7 
allow docker util to be reloaded with reload_modules
 2017-08-21 16:14:36 -06:00
Mike Place
b071384611 Merge pull request #42977 from redmatter/fix-broken-docker-network-create 
Remove check_duplicates from create_network call
 2017-08-21 15:59:50 -06:00
Mike Place
5482524270 Merge pull request #41994 from twangboy/win_unit_test_cmdmod 
Fix `unit.modules.test_cmdmod` on Windows
 2017-08-21 15:53:01 -06:00
Mike Place
a063ddbaad Merge branch 'develop' into kernelpkg-remove 2017-08-21 14:18:22 -06:00
Daniel Wallace
373a9a0be4 allow docker util to be reloaded with reload_modules 
If we reference the actual import, the utils module won't be reloaded, but if
we use `__utils__` it can be reloaded on a pip install
 2017-08-21 13:18:08 -06:00
garethgreenaway
882fcd846f Merge pull request #43029 from terminalmage/fix-func-alias 
Normalize the salt caching API
 2017-08-21 09:54:58 -07:00
William Cannon
e9cdbe7266 fixing pylint issues 2017-08-18 19:45:17 -05:00
William Cannon
3f490f63f5 fixes for pylint 2017-08-18 19:24:30 -05:00
William Cannon
1499314595 Merge branch 'develop' of https://github.com/saltstack/salt into salt-check-feature 2017-08-18 16:37:40 -05:00
Nicole Thomas
9ac043d997 Merge branch 'develop' into fix-iptables-negation 2017-08-18 16:52:29 -04:00
rallytime
6ca3607770 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
  - salt/modules/win_pkg.py
  - salt/utils/versions.py
 2017-08-18 09:28:26 -04:00
Jochen Breuer
3c99e61637
Renamed test to match new convention 2017-08-18 15:19:34 +02:00
Jochen Breuer
caf78d206d
Fixed imports for pytest 
Imports now match the new test-suite introduced in 2017.7.
 2017-08-18 15:15:20 +02:00
rallytime
84829a6f8c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/jenkins.py
  - salt/states/jenkins.py
 2017-08-18 09:13:54 -04:00
Daniel Wallace
35e45049e2 use a ruby gem that doesn't have dependencies 2017-08-18 08:55:02 -04:00
Andrew Bulford
d4507f1a08 Re-use container connection logic on net creation 
Re-factoring a little following the previous commit, so that the same
container connection logic can be used in both places, rather than it
being repeated.
 2017-08-18 13:36:46 +01:00
Andrew Bulford
d59d0adfeb Add ability to re-configure docker networks 
Previously any changes to network states wouldn't result in any change
to the network when the state was applied.  This was less of an issue
the only attributes you could set for a network were its name and
driver, but with the recent support for driver options and now IPAM
config being added, it's useful for the state to be able to modify the
network if it needs to.

The Docker API doesn't provide any facility to modify an existing
network, so the only option is to recreate it with the new options,
which means disconnecting and reconnecting all containers.

Fixes #43047
 2017-08-18 13:36:14 +01:00
Andrew Bulford
ec2a8a82c8 Add support for IPAM config in Docker networks 
Fixes #43047
 2017-08-18 13:35:48 +01:00
Andrew Bulford
8048fbcfa7 Remove check_duplicates from create_network call 
The create_network function in dockermod.py doesn't take a
check_duplicates argument so passing it here causes a failure.

Fixes #42976
 2017-08-18 13:26:33 +01:00
garethgreenaway
2957467ed7 Merge pull request #43026 from rallytime/bp-43020 
Back-port #43020 to 2016.11
 2017-08-17 16:19:46 -07:00
Erik Johnson
f8f74a310c Update localfs cache tests to reflect changes to func naming 2017-08-17 17:19:34 -05:00
twangboy
fbe54c9a33 Remove unused import six (lint) 2017-08-17 15:54:38 -06:00
twangboy
7f5ee55f57 Fix unit.utils.test_url for Windows 
Detect escaped urls in Windows
Unescape urls in Windows
Fix tests to deal with sanitized Windows paths
 2017-08-17 14:20:25 -06:00
Nicole Thomas
c35706fa3f Merge pull request #43011 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-17 16:19:33 -04:00
Daniel Wallace
ba80a7d4b5 use a ruby gem that doesn't have dependencies 2017-08-17 13:45:10 -06:00
garethgreenaway
51d16840bb Merge pull request #42890 from DSRCorporation/bugs/42627_salt-cp 
Make chunked mode in salt-cp optional
 2017-08-17 11:37:43 -07:00
Daniel Wallace
0eb15a1f67 test with gem that appears to be abandoned 2017-08-17 14:28:39 -04:00
twangboy
b04d1a2f18 Fix unit.utils.test_find for Windows 
Fix skipIf statements
Use sys.maxsize instead of sys.maxint
 2017-08-17 11:55:00 -06:00
Adam Mendlik
f87fe54b7b Fix linter errors for kernelpkg modules and states 2017-08-17 11:27:57 -06:00
Adam Mendlik
8f575ade60 Add kernelpkg.remove function for APT-based systems 2017-08-17 11:27:57 -06:00
Adam Mendlik
5c4a5ca59a Add kernelpkg.remove function for YUM-based systems 2017-08-17 11:27:57 -06:00
Erik Johnson
4089b7b1bc Use socket.AF_INET6 to get the correct value instead of doing an OS check 
This builds on #43014 with a more future-proof solution.
 2017-08-17 12:12:27 -05:00
garethgreenaway
973d288eca Merge pull request #43020 from gtmanfred/test_gem 
test with gem that appears to be abandoned
 2017-08-17 09:40:40 -07:00
Daniel Wallace
0a1f40a664 test with gem that appears to be abandoned 2017-08-17 10:38:32 -06:00
garethgreenaway
daa2537c75 Merge branch 'develop' into missing_minions_branch 2017-08-17 08:27:58 -07:00
Ch3LL
b8eee4401e Change AF_INET6 family for mac in test_host_to_ips 2017-08-17 10:55:53 -04:00
rallytime
93c11d827a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
  - salt/minion.py
 2017-08-17 09:30:50 -04:00
rallytime
8a0f948e4a Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/utils/versions.py
  - tests/unit/modules/test_boto_elb.py
  - tests/unit/modules/test_boto_secgroup.py
  - tests/unit/states/test_boto_vpc.py
 2017-08-17 09:10:31 -04:00
aajdinov
d365888489 Initial commit of oneandone salt cloud driver. 2017-08-17 08:03:01 +00:00
twangboy
92dc3c0ece Use os.sep for path 2017-08-16 15:59:10 -06:00
Lukas Raska
90c46ddefb Allow cmdmod.exec_code_all to utilize cmdmod.run_all parameters 2017-08-16 21:40:33 +02:00
Gareth J. Greenaway
eec0646c79 Fixing lint error in test_auth.py 2017-08-16 11:22:16 -07:00
Tarjei Husøy
6f19fc023c Fix broken negation in iptables 
Introduced in 7c6ff77c and released with 2017.7.
 2017-08-16 10:30:55 -07:00
twangboy
201ceae4c4 Fix lint, remove debug statement 2017-08-16 10:29:26 -06:00
Andrew Bulford
d3f792d47d Remove check_duplicates from create_network call 
The create_network function in dockermod.py doesn't take a
check_duplicates argument so passing it here causes a failure.

Fixes #42976
 2017-08-16 14:05:31 +01:00
Jochen Breuer
c8e98c8d8a Added unit tests for Kubernetes module 
Added unit tests for:
    * Node listing,
    * deployment listing,
    * service listing,
    * pod listing,
    * deployment deletion and
    * deployment creation.
 2017-08-16 14:51:16 +02:00
Gilbert Gilb's
08d453eb37 Fix unit tests. 2017-08-16 09:00:26 +02:00
Gareth J. Greenaway
869599cb42 Updating another test for nodegroups in pillar. 2017-08-15 20:24:40 -07:00
Gareth J. Greenaway
0c0cdd8aa1 Updating the test_auth tests. 2017-08-15 20:24:40 -07:00
Gareth J. Greenaway
e6b750d6a1 Adding some integration tests. 2017-08-15 20:24:40 -07:00
twangboy
e9febe4893 Fix unit.test_fileclient 
Use os.sep instead of hard-coded, unix-style paths
 2017-08-15 16:34:03 -06:00
Mike Place
40c4323593 Merge branch 'develop' into modularise-tokens 2017-08-15 15:48:25 -06:00
Nicole Thomas
abac36d907 Merge pull request #42450 from pwdng/ldap_fix 
Use OrderedSet instead of set to allow handling of OpenLDAP X-ORDERED…
 2017-08-15 17:30:35 -04:00
twangboy
37029c1a16 Fix unit.test_doc test 
Use findstr instead of grep on Windows
Use os.linesep for file paths
 2017-08-15 15:30:13 -06:00
Nicole Thomas
275122d04e Merge pull request #42834 from terminalmage/salt.utils.versions 
Move 4 functions from salt.utils to salt.utils.versions
 2017-08-15 17:28:24 -04:00
Mike Place
f881aa5117 Merge branch 'develop' into nfs-exports 2017-08-15 13:28:12 -06:00
Mike Place
4f406602cf Merge branch 'develop' into ldap_fix 2017-08-15 12:36:47 -06:00
rallytime
c6b9ca4b9e Lint fix: add missing space 2017-08-15 14:26:44 -04:00
rallytime
5597b1a30e Skip 2 failing tests in Python 3 due to upstream bugs 2017-08-15 14:26:44 -04:00
rallytime
a0b19bdc27 Update account id value in boto_secgroup module unit test 
This value was updated in moto 1.0.0 with the following commit:

5f3fbff627
 2017-08-15 14:23:00 -04:00
rallytime
60b406e088 @mock_elb needs to be changed to @mock_elb_deprecated as well 2017-08-15 14:23:00 -04:00
rallytime
6ae1111295 Replace @mock_ec2 calls with @mock_ec2_deprecated calls 
moto versions >= 1.0.0 have changed the way the mocked connections through
boto are handled with the @mock_ec2 decorator. They use the boto3 connection
method. However, since we are still using boto in many places, we need to use
the new @mock_ec2_deprecated decorator instead to handle the boto connection
functions for the unit tests.

Versions of moto < 1.0.0 are not Python 3 compatible, so salt-jenkins should
be installing newer versions of moto for those tests. Unfortunately, we cannot
install an older version of moto for Python2 that use the original @mock_ec2 call
and also import the @mock_ec2_deprecated function for newer versions of moto
simultaneously as the @mock_ec2_deprecated function doesn't exist in older
versions of moto.
 2017-08-15 14:22:59 -04:00
Erik Johnson
2b76029ded Move 4 functions from salt.utils to salt.utils.versions 
This moves the following functions from salt.utils to salt.utils.versions:

- warn_until
- kwargs_warn_until
- compare_versions (as salt.utils.versions.compare)
- version_cmp
 2017-08-15 12:53:57 -05:00
Nicole Thomas
47ff9d5627 Merge pull request #42812 from terminalmage/yaml-loader-tests 
Update custom YAML loader tests to properly test unicode literals
 2017-08-15 13:50:22 -04:00
Erik Johnson
9d8486a894 Add test for custom YAML loader with unicode literal strings 2017-08-15 11:06:20 -05:00
Erik Johnson
a0118bcece Remove bytestrings and use textwrap.dedent for readability 
PyYAML works with and without bytestrings on PY3, and Python 3 can read
all of the test data as regular strings, so bytestrings are unnecessary
here.

This also adds use of textwrap.dedent to make the YAML easier to read,
so it can be indented away from the far left side of the line.
 2017-08-15 11:05:48 -05:00
garethgreenaway
8b48341a36 Merge branch 'develop' into fixing_beacons 2017-08-15 09:00:09 -07:00
Mike Place
db32d81d8a Merge pull request #42917 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-14 21:53:18 -06:00
Mike Place
11a33fe692 Merge pull request #42925 from terminalmage/f26-debug-logging 
Add debug logging to troubleshoot test failures
 2017-08-14 21:47:50 -06:00
Erik Johnson
8165f46165 Add debug logging to troubleshoot test failures 
This adds logging to troubleshoot https://github.com/saltstack/salt-jenkins/issues/477
 2017-08-14 16:28:09 -05:00
Nicole Thomas
4fcdab3ae9 Merge pull request #42657 from nhavens/2017.7 
back-port #42612 to 2017.7
 2017-08-14 15:42:25 -04:00