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
85,679 Commits 24 Branches 182 Tags 341 MiB
b712f971f7
Commit Graph

10791 Commits

Author SHA1 Message Date
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
garethgreenaway
bbaae409b5 Merge branch 'develop' into postgres-valid-until 2017-08-14 12:09:43 -07:00
Gareth J. Greenaway
ed742bb506 Updating mock from salt.utils to salt.utils.files for fopen. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
bf1aefa47b Updating memusage, ps and diskusage beacons for python3 related failures. Updating respective tests as well. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
fe5dd1e7b9 Removing unused import from ps beacon. Fixing mock for sensehat test. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
9072edd8a1 Fixing mocking for ps beacon. Types for sensehat beacon. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
d8ac1f8cfb Updating unit and integration tests for beacons to reflect changes. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
ff6f42405f Fixing typo in service beacon. Removing unused import. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
4e1fea1433 Updating logging, shuffling some imports of salt.ext.six.moves around to fix linting. better way to determine the twilio library version. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
813445d1ed Updating with various requested changes 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
cca7c0d091 Removing the wrong import, re-adding Mock and removing the ones that are not used. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
71963cccce fixing more lint issues 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
1ec4ccba85 Renaming all tests to be consistent with naming. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
23d572199a Adding test_beacon for the beacon state module. Updating beacon state module documentation. Removing over aggressive code in the validate function for service beacon. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
474b6dbdf8 Updating various documentation and beacons. Adding unit tests for the beacon module. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
7f89fa4886 Removing test_network_settings_match from tests. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
ee3befbed8 Updating documentation for wtmp, btmp, fixing service tests and updating various bits in the service beacon. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
6f9412b41c adding network_info, network_settings, and service tests. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
4f6c04cbbf Adding the tests 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
507071e9e6 Updating the salt_proxy beacon to use list based configuration and adding unit tests. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
a04b0fe3ee Updating network_info beacon for list based configuration. Adding unit tests for network_info beacon 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
8b507b1635 Updating twilio_txt_msg & memusage beacons to ensure list based configuration. Adding/Updating unit tests for both. Updating twilio related things to support newer version of twilio python library. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
366bed8998 Updating twilio_txt_msg beacon for list based configuration. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
7361672339 Updating the telegram_bot_msg beacon to use list based configuration rather that dictionary based configuration. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
dfc27c63fd Updating beacon.log to use list based configuration rather than dictionary. Adding the unit test for beacon.log. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
b03f840aed Simplying the validate functions by converting from list to dict when looking for various items to be present. 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
2a02d1c324 Updating inotify beacon & inotify beacon test to use list based configuration rather than dictionary based configuration 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
8f0a34e035 Adding unit test for haproxy beacon. Updating haproxy beacon to use list based configuration instead of dictionary based configurations 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
ebcdbfeb52 Shuffling things around in the haproxy module. Initially adding the unit test. 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
f3843ac789 Fixing validate in adb to check that the states parameter is an array/list. Updating glxinfo and glxinfo beacon tests to use configuration based on a list rather than a dictionary. 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
0b0ada65e3 Couple typos in the avahi and bonnjour beacons. Reworked the diskusage beacon to handle regex properly. Adding unit test for diskusage beacon. 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
cf1a4ff2d6 Fixing some typos in adb beacon, updating unit tests to reflect changes 2017-08-14 12:04:36 -07:00
rallytime
78e744bda4 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/fileclient.py
  - salt/modules/status.py
  - tests/integration/states/test_npm.py
 2017-08-14 14:21:17 -04:00
Nicole Thomas
c6ca7d639f Merge pull request #42889 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-14 10:16:19 -04:00
Adam Bolte
7848189ad4
Implement rbenv state module test mode checks 
Fixes #42815 and updates unit tests.
 2017-08-14 19:13:42 +10:00
Dmitry Kuzmenko
9fedf6012e Fixed 'test_valid_docs' test. 2017-08-14 10:54:16 +03:00
Gilbert Gilb's
3c136e3138 Add support for PostgreSQL password expiration. 2017-08-12 13:48:12 +02:00
rallytime
fb7117f2ac Use salt.utils.versions.LooseVersion instead of distutils 2017-08-11 16:31:24 -04:00
Erik Johnson
1764878754 Merge pull request #42883 from rallytime/fix-boto-tests 
Fix failing boto tests
 2017-08-11 15:29:11 -05:00
rallytime
29ff19c587 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/states/dockerng.py
  - salt/utils/cloud.py
 2017-08-11 15:17:19 -04:00
Nicole Thomas
b21778efac Merge pull request #42885 from terminalmage/fix-f26-tests 
Move weird tearDown test to an actual tearDown
 2017-08-11 15:14:41 -04:00
rallytime
6a7bf99848 Lint fix: add missing space 2017-08-11 14:19:15 -04:00
Erik Johnson
462d653082 Move weird tearDown test to an actual tearDown 
Also catch KeyError when user doesn't exist
 2017-08-11 12:20:50 -05:00
Daniel Wallace
da3402a53d make sure cmd is not run when npm isn't installed 
apparently the skipIf on the functions still get run, even if the function is
going to be skipped based on a skipIf on the class.
 2017-08-11 10:58:00 -06:00
rallytime
43643227c6 Skip 2 failing tests in Python 3 due to upstream bugs 2017-08-11 12:57:39 -04:00
rallytime
7f46603e9c 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-10 17:31:14 -04:00
rallytime
7c1d493fdd @mock_elb needs to be changed to @mock_elb_deprecated as well 2017-08-10 17:15:45 -04:00
Daniel Wallace
c1f673eca4 use older name if _create_unverified_context is unvailable 2017-08-10 14:43:33 -06:00
rallytime
3055e17ed5 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-10 16:40:11 -04:00
Daniel Wallace
b458b89fb8 skip cache_clean test if npm version is >= 5.0.0 2017-08-10 14:17:47 -06:00
rallytime
5d8d6225b5 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/augeas_cfg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/runners/manage.py
  - salt/states/boto_cfn.py
  - salt/utils/cloud.py
  - tests/integration/states/test_pkg.py
 2017-08-10 14:47:14 -04:00
Nicole Thomas
e6357abdda Merge pull request #42718 from moio/yumpkg-list_pkg-attr-parameter 
yumpkg.list_pkgs: add parameter for returned attribute selection
 2017-08-09 16:58:02 -04:00
Silvio Moioli
5a15e53886 yumpkg.list_pkg: add/adapt tests 
This includes changes to the zypper tests because of the refactoring that
affected both modules.
 2017-08-09 11:43:56 +02:00
Erik Johnson
c69f17dd18 Add integration test for #42774 2017-08-08 14:20:42 -05:00
Erik Johnson
3184168365 Use explicit unicode strings + break up salt.utils 
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.

A summary of the changes in this PR is as follows:

* Moves the following functions from `salt.utils` to new locations
  (including a deprecation warning if invoked from `salt.utils`):
  `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
  `dequote`, `is_hex`, `is_bin_str`, `rand_string`,
  `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
  `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
  `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
  `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
  `is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
  `salt/utils/__init__.py` for better organization, so we can keep the
  deprecated ones separate from the ones yet to be deprecated as we
  continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
  unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
  import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
  accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
  such that it returns a string matching the passed size. Previously
  this function would get `size` bytes from `os.urandom()`,
  base64-encode it, and return the result, which would in most cases not
  be equal to the passed size.
 2017-08-08 13:33:43 -05:00
Nicole Thomas
ddb671b8fe Merge pull request #42783 from rallytime/fix-flaky-py3-test 
Sort lists before comparing them in python 3 unit test
 2017-08-08 09:25:14 -04:00
kunal-bajpai
9ce6e0f3b1 Merge branch 'develop' into modularise-tokens 2017-08-08 16:20:56 +05:30
Kunal Ajay Bajpai
0d7658c870 Fixed lint failure 2017-08-08 14:21:02 +05:30
Kunal Ajay Bajpai
200f414969 Fixed failing LoadAuth unit test 2017-08-08 13:35:05 +05:30
rallytime
998834fbac Sort lists before compairing them in python 3 unit test 2017-08-07 16:09:43 -04:00
rallytime
f49da018e4 Sort lists before compairing them in python 3 unit test 2017-08-07 14:38:10 -04:00
Erik Johnson
665de2d1f9 Fix domainname parameter input translation 
Resolves #42538
 2017-08-07 09:51:14 -05:00
rallytime
f20f3742cb Merge branch '2017.7' into 'develop' 
Conflicts:
  - tests/unit/test_crypt.py
 2017-08-07 10:43:06 -04:00
Mike Place
547ada9418 Merge pull request #42612 from nhavens/develop 
fix for issue #42611
 2017-08-03 17:37:05 -05:00
Mike Place
b8acf9f6ec Merge pull request #42624 from lyft/modernize-boto-sqs-modules 
Modernize boto_sqs execution and state modules
 2017-08-03 17:34:18 -05:00
Mike Place
834d6c605e
Set fact gathering style to 'old' for test_junos 
Without this, we stacktrace because it does not appear that setting
'gather_facts' to False prevents the library from assuming the presence
of facts. I believe this to be an upstream bug with jnpr.

Because they have listed this as being a deprecated option in the future
this may re-break in the future.
 2017-08-02 23:11:52 -06:00
Mike Place
4c1d931654 Merge pull request #42481 from twangboy/win_unit_test_crypt 
Fix `unit.test_crypt` for Windows
 2017-08-01 13:10:49 -05:00
Neile Havens
d73c4b55b7 back-port #42612 to 2017.7 2017-07-31 17:10:06 -05:00
Neile Havens
afce919746 Merge branch 'develop' into develop 2017-07-31 15:51:10 -05:00
Mike Place
968a9dba46 Merge pull request #42354 from alexbleotu/vmware_logs_and_no_permission_exc-gh 
VMware utils functions: additional logs & raise NoPermission exceptions
 2017-07-31 15:03:45 -05:00
Mike Place
5baf2650fc Merge pull request #42453 from gtmanfred/makedirs 
don't pass user to makedirs on windows
 2017-07-31 14:57:57 -05:00
Mike Place
a09091a696 Merge pull request #42517 from alexbleotu/linux_acl_fixes-gh 
Fixes to linux_acl.present state & cmd.run function
 2017-07-31 14:44:57 -05:00
garethgreenaway
25094ad9b1 Merge pull request #42602 from garethgreenaway/42514_2017_7_superseded_deprecated_from_pillar 
Use superseded and deprecated configuration from pillar
 2017-07-31 11:53:06 -07:00
Aneesh Agrawal
c4f5888c85 Modernize boto_sqs execution and state modules 
Headline changes:
- Move to boto3
- Use result-style error handling
- Optimize number of API calls:
  - Set attributes at creation time
  - Set all attributes in one API call
- Show diff when attribute changes detected
 2017-07-31 18:08:29 +00:00
Philippe Wooding
78f5da36f4
Update LDAP unit test 2017-07-31 14:28:27 +02:00
Anil Kabra
a8f263d1cb Merge branch 'develop' into v2016.11.5_protect_master_key 2017-07-28 14:03:26 -05:00
Anil Kabra
b77b2e2a05 Fix unit test signing with passphrase 2017-07-28 14:02:31 -05:00
garethgreenaway
7e58b5160d Merge branch 'develop' into develop 2017-07-28 11:28:46 -07:00
Nicole Thomas
7d385f8bdc Merge pull request #42006 from redmatter/fix-dockerng-network-matching-2017.7 
Fix dockerng.network_* name matching
 2017-07-28 09:52:51 -06:00
Nicole Thomas
f83960c02a Lint: Remove extra line at end of file. 2017-07-28 09:13:59 -06:00
Anil Kabra
2f3c50206b Fix calls to files utility module method from open from fopen 2017-07-28 09:40:57 -05:00
Neile Havens
8eee58af97 fix test_selinux for issue #42611 
- expect change from selinux.boolean state if it makes changes
- result = False if there's an error making changes
 2017-07-28 09:39:38 -05:00
Anil Kabra
f474016037 Merge branch 'v2016.11.5_protect_master_key' of https://github.com/Mastercard/salt into v2016.11.5_protect_master_key 2017-07-28 07:46:08 -05:00
Anil Kabra
7875ee9d34 Fixed error due to new files module in utils 2017-07-28 07:44:50 -05:00
Andrew Bulford
c7d364ec56 Add regression tests for #41982 
These test the scenarios where another network with a similar name
already exists, verifying that absent doesn't attempt to remove a
network which isn't specified, and present still attempts to create the
specified network despite a similarly named network already being present.
 2017-07-28 10:41:44 +01:00
Andrew Bulford
d31f2913bd Fix broken unit test test_network_absent 
This started failing following commit 515c612, which relied on the
'Name' key being present in the return value of docker.networks -
as the mock didn't have this set the test started failing.
 2017-07-28 09:57:45 +01:00
garethgreenaway
bab7503f68 Merge branch 'develop' into linux_acl_fixes-gh 2017-07-27 16:59:36 -07:00
William Cannon
e4f7603723 removed comments, updated docstrings - mostly cosmetic 2017-07-27 15:43:12 -07:00
Nicole Thomas
22eea389fa Merge pull request #42290 from isbm/isbm-module_run_parambug_42270_217 
Backport of #42270
 2017-07-27 16:30:05 -06:00
Anil Kabra
3a9746f67e Merge branch 'develop' into v2016.11.5_protect_master_key 2017-07-27 17:04:51 -05:00
William Cannon
e7785bf758 changed output of tests from True/False to Pass/Fail, updated unit tests 2017-07-27 14:33:16 -07:00
Nicole Thomas
6b45debf28 Merge pull request #41988 from redmatter/fix-dockerng-network-matching 
Fix dockerng.network_* name matching
 2017-07-27 15:25:06 -06:00
Gareth J. Greenaway
74bae13939 Small update to something I missed in the first commit. Updating tests to also test for pillar values. 2017-07-27 13:19:48 -07:00
rallytime
9b66464fcc Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-07-27 13:52:52 -06:00
Mike Place
2985e4c0e6 Merge pull request #42255 from twangboy/win_unit_test_win_system 
Fix `unit.modules.test_win_system` for Windows
 2017-07-27 14:12:41 -05:00
Mike Place
66a2a8edc0 Merge pull request #42398 from garethgreenaway/42189_show_docs_then_error 
Show documentation when no function is included
 2017-07-27 13:49:35 -05:00
Mike Place
71b4c86a40 Merge pull request #42430 from alexbleotu/esxdatacenter_proxy-gh 
Esxdatacenter proxy + related updates
 2017-07-27 13:47:10 -05:00
Anil Kabra
acfc5fb710 Resolved merge conflict 2017-07-27 13:28:41 -05:00
Sigmon, Jeffrey
bb29afd022 Passphrase protect master private key 2017-07-27 13:17:26 -05:00
Daniel Wallace
559d432930 fix tests 2017-07-27 12:00:38 -06:00
rallytime
1f0b90aa57 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/engines/slack.py
 2017-07-26 17:51:36 -06:00
William Cannon
493d065e21 added auto check of minion config option 2017-07-26 15:00:56 -07:00
William Cannon
1088e5eddc major updates - refactored to make __salt__ work in module with unit tests, squashed deep nesting bug too 2017-07-26 15:00:56 -07:00
William Cannon
5d088a6359 added lots of unit tests 2017-07-26 15:00:56 -07:00
William Cannon
4b502b3c3b pylint fixes, initial unit test 2017-07-26 15:00:56 -07:00
Gareth J. Greenaway
016e2e7a34 Updating tests to reflect changes. Updating to include passed function name in returned docs with message that it is not available. 2017-07-26 09:04:22 -07:00
Alexandru Bleotu
2218905cb7 Merge branch 'develop' into vmware_logs_and_no_permission_exc-gh 2017-07-25 23:38:01 +01:00
Alexandru Bleotu
4715c8eca3 Merge branch 'develop' into linux_acl_fixes-gh 2017-07-25 23:36:52 +01:00
Alexandru Bleotu
c565ed94dd Merge branch 'develop' into esxdatacenter_proxy-gh 2017-07-25 23:36:25 +01:00
Mike Place
fa519b76d0 Merge pull request #42310 from moio/zypper-list_pkg-attr-parameter 
zypper.list_pkgs: add parameter for returned attribute selection
 2017-07-25 16:07:45 -05:00
Mike Place
62abac6fbc Merge pull request #42396 from rallytime/parse_docstring_util 
Move parse_docstring from salt.utils to salt.utils.doc.py
 2017-07-25 16:04:00 -05:00
Alexandru Bleotu
89cebfd96b Merge branch 'develop' into linux_acl_fixes-gh 2017-07-25 21:54:46 +01:00
Mike Place
07c2793e86 Merge pull request #42266 from twangboy/win_unit_states_test_file 
Fix `unit.states.test_file` for Windows
 2017-07-25 15:26:32 -05:00
Mike Place
641a9d7efd Merge pull request #41968 from root360-AndreasUlm/fix-rabbitmqctl-output-handler 
Fix rabbitmqctl output sanitizer for version 3.6.10
 2017-07-25 14:12:36 -05:00
Alexandru Bleotu
b2a2791534 Merge branch 'develop' into vmware_logs_and_no_permission_exc-gh 2017-07-24 20:30:58 +01:00
Alexandru Bleotu
0f3d784c0f Updated all tests for modules.mod_acl and added one when the error is raised 2017-07-24 19:35:06 +01:00
Alexandru Bleotu
8e415c8ef7 Updated and added linux_acl_test.present tests 2017-07-24 19:35:06 +01:00
Nicole Thomas
c793d83d26 Merge pull request #42180 from twangboy/win_unit_test_timezone 
Fix `unit.modules.test_timezone` for Windows
 2017-07-24 08:46:16 -06:00
Nicole Thomas
083ff00410 Merge pull request #42474 from whiteinge/cmd-arg-kwarg-parsing-test 
Cmd arg kwarg parsing test
 2017-07-24 08:13:29 -06:00
twangboy
102509029e Remove chown mock, fix path seps 2017-07-21 16:36:07 -06:00
Seth House
0cc0c0967a Lint fixes 2017-07-21 16:14:32 -06:00
garethgreenaway
580c6989b3 Merge branch 'develop' into esxdatacenter_proxy-gh 2017-07-21 10:45:53 -07:00
Alexandru Bleotu
500899bc12 Fix tests #2 2017-07-21 08:18:57 +01:00
Alexandru Bleotu
0ba680f68e Merge branch 'develop' into datacenter_vsphere_func-gh 2017-07-21 07:58:56 +01:00
Silvio Moioli
5e23f5d678 zypper.list_pkgs: add install_time_date_t as a supported attribute 2017-07-21 08:15:50 +02:00
Silvio Moioli
db22777a09 zypper_test: add test for list_pkgs and attr 2017-07-21 08:14:37 +02:00
Silvio Moioli
bb049cb70f zypper_test: adapt existing unit tests to new code 2017-07-21 08:14:37 +02:00
Silvio Moioli
a32ee4af05 zypper_test: correct mock behavior 
Previously incorrect, although the test passed
 2017-07-21 08:14:37 +02:00
Alexandru Bleotu
7f52358eac Fixed test 2017-07-21 00:07:42 +01:00
Alexandru Bleotu
632cbf69b4 Fixed pylint 2017-07-20 22:22:24 +01:00
Seth House
622ff5be40 Add LocalClient.cmd test for arg/kwarg parsing 2017-07-20 14:28:24 -06:00
Alexandru Bleotu
d5b6c6be25 Fixed pylint 2017-07-20 21:06:35 +01:00
rallytime
c673b64583 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/conf.py
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/engines/hipchat.py
  - salt/engines/slack.py
  - salt/grains/core.py
  - salt/version.py
  - tests/integration/states/test_renderers.py
 2017-07-20 09:54:08 -06:00
Alexandru Bleotu
5a63ed7449 Added tests for datacenter_configured state 2017-07-20 16:43:44 +01:00
Erik Johnson
2fb986f5ca Merge pull request #42367 from rallytime/files-util 
Move file-related utilities out of init file and into salt.utils.files.py
 2017-07-19 16:55:52 -05:00
rallytime
60d80fc06c Move parse_docstring from salt.utils to salt.utils.doc.py 
- Moves function to new location in salt.utils.doc.py
- Adds deprecation warning to salt.utils.parse_docstring
- Moves related unit test in test_utils.py to new test_doc.py file
 2017-07-19 12:06:55 -06:00
Mike Place
0a72e56f6b Merge pull request #42356 from meaksh/2016.11-AliasesLoader-wrapper-fix 
Allow to check whether a function is available on the AliasesLoader wrapper
 2017-07-19 11:56:41 -05:00
Mike Place
c9972fe4fb Merge pull request #42383 from AndrewPashkin/revert-37003-gradual-pillar-loading 
Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file"
 2017-07-19 11:28:22 -05:00
Alexandru Bleotu
89f4f324e6 Added tests for salt.modules.vsphere.create_datacenter 2017-07-19 17:20:24 +01:00
Alexandru Bleotu
b0aafe1632 Added tests for salt.modules.vsphere.list_datacenters_via_proxy 2017-07-19 17:20:23 +01:00
Nicole Thomas
59e012b485 Merge pull request #42150 from twangboy/win_unit_test_pip 
Fix `unit.modules.test_pip` for Windows
 2017-07-19 10:01:17 -06:00
Nicole Thomas
ade25c6b34 Merge pull request #42154 from twangboy/win_unit_test_reg 
Fix `unit.modules.test_reg_win` for Windows
 2017-07-19 10:00:38 -06:00
Mike Place
7419e82cb2 Merge pull request #42362 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-07-19 10:56:15 -05:00
Nicole Thomas
07593675e2 Merge pull request #42182 from twangboy/win_unit_test_useradd 
Fix `unit.modules.test_useradd` for Windows
 2017-07-19 09:55:32 -06:00
Alexandru Bleotu
f343a2b277 Added tests for esxdatacenter proxy 2017-07-19 15:24:10 +01:00
Alexandru Bleotu
e041b8f486 Added tests for get_details in modules.esxdatacenter 2017-07-19 15:24:10 +01:00
Alexandru Bleotu
6814e8405d Added tests for supporting esxdatacenter proxy in modules.vsphere 2017-07-19 15:24:10 +01:00
Andrew Pashkin
b0148c15c7 Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file" 2017-07-19 12:25:22 +03:00
rallytime
0ab4787d81 Fix all salt.utils fopen references in test_file 2017-07-18 17:10:11 -06:00
rallytime
3f0945b9b7 Fix one more salt.utils fopen reference to point to files 2017-07-18 15:04:49 -06:00
rallytime
89d957b124 Update unit test mocks for salt.utils.files.fopen 2017-07-18 13:40:07 -06:00
rallytime
0f5dd79aa0 Lint fixes 2017-07-18 12:46:15 -06:00
rallytime
df693423b9 Move salt.utils.rm_rf to salt.utils.files.rm_rf 
Also added a deprecation warning to utils/__init__.py and updated
all references to rm_rf in salt codebase.
 2017-07-18 10:48:54 -06:00
rallytime
ccf790a83f Update all references for moved functions to use "files" util 
- fopen
- flopen
- fpopen
- safe_rm
- is_empty
- is_fcntl_available
 2017-07-18 10:31:01 -06:00
rallytime
7aa31ff030 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/modules/pillar.py
  - salt/states/saltmod.py
  - salt/states/user.py
  - tests/integration/states/handle_iorder.py
 2017-07-18 09:05:43 -06:00
rallytime
f59ecb7ffe Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/executors/sudo.py
 2017-07-18 08:57:55 -06:00
Pablo Suárez Hernández
915d94219e Allow to check whether a function is available on the AliasesLoader wrapper 2017-07-18 12:57:36 +01:00
Alexandru Bleotu
e783d6edd5 pylint 2017-07-18 06:44:34 -04:00
Erik Johnson
14cf6ce322 is_windows is a function, not a propery/attribute 
While not fatal, this could potentially cause problems running this
test on Windows.
 2017-07-17 23:36:21 -05:00
Mike Place
3ec5bb1c2f Merge pull request #42257 from twangboy/win_unit_pillar_test_git 
Fix `unit.pillar.test_git` for Windows
 2017-07-17 12:51:41 -05:00
Mike Place
36395625c2 Merge pull request #42258 from twangboy/win_unit_states_tests_environ 
Fix `unit.states.test_environ` for Windows
 2017-07-17 12:50:37 -05:00
Mike Place
894bdd2b19 Merge pull request #42265 from rallytime/gate-moto-version 
Gate boto_elb tests if proper version of moto isn't installed
 2017-07-17 12:47:51 -05:00
Mike Place
baf04f2a2d Merge pull request #42277 from twangboy/win_unit_states_test_winrepo 
Fix `unit.states.test_winrepo` for Windows
 2017-07-17 12:37:06 -05:00
Alexandru Bleotu
c256eaef82 Renamed vmware_test folder to vmware to follow new naming standard 2017-07-17 13:12:34 -04:00
Alexandru Bleotu
62edc82d34 Added tests for catching vim.fault.NoPermission for all tested function in utils.vmware 2017-07-17 13:12:32 -04:00
Alexandru Bleotu
ec5532cdcf Added no_permission tests to vmware functions 2017-07-17 13:12:30 -04:00
Mike Place
acd29f9b38 Merge pull request #42206 from rallytime/fix-flaky-test 
[PY3] Fix test that is flaky in Python 3
 2017-07-17 12:09:52 -05:00
Mike Place
8f1cb287cf Merge pull request #42126 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-17 12:07:18 -05:00
Arnold Bechtoldt
178274f320 actually add newline (per line) to form a valid file 2017-07-14 09:40:40 +02:00
Bo Maryniuk
8c71257a4b Call unnamed parameters properly 2017-07-13 10:11:00 +02:00
Bo Maryniuk
94c97a8f25 Update and correct the error message 2017-07-13 10:10:50 +02:00
twangboy
ed89cd0b93 Use os.sep for path seps 2017-07-12 10:13:26 -06:00
Andrew Pashkin
7d59f7a6c6 Make possible to reference pillars, that come before current pillar in the top file 2017-07-12 19:03:05 +03:00
twangboy
669aaee10d Mock file exists properly 2017-07-11 17:09:21 -06:00
rallytime
78cdee51d5 Gate boto_elb tests if proper version of moto isn't installed 
For Python 2 tests, we can use an older version. But when running
these tests of Python 3, we need a newer version of moto that supports
Python 3.

This gates the tests if the expected version of moto is missing.
 2017-07-11 17:00:50 -06:00
twangboy
a4231c9827 Fix ret mock for linux 2017-07-11 16:59:42 -06:00
twangboy
0c484f8979 Fix unit tests on Windows 2017-07-11 16:55:43 -06:00
Nathan Fish
ed531304e2 test_nfs3: pass string, not list 2017-07-11 15:05:25 -05:00
twangboy
55b278c478 Mock the reg.read_value function 2017-07-11 13:23:11 -06:00
twangboy
45be32666a Add error-handling function to shutil.rmtree 2017-07-11 13:08:00 -06:00
twangboy
acc0345bc8 Fix unit tests 2017-07-11 12:08:13 -06:00
rallytime
7e0c099ab3 Add get_driver function used with libcloud modules to doc exception list 
Fixes failing valid_docs test in develop
 2017-07-11 09:13:38 -06:00
Mike Place
e0c4a4bb1b Merge pull request #42192 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-07-07 13:59:30 -05:00
rallytime
bf45c18f9d Convert remaining "assert_called_once" references to new syntax 
These tests are new to develop and need to be converted to use the new
assert_called_once syntax introduced in #42084.
 2017-07-07 10:28:19 -06:00
rallytime
2be4865f48 [PY3] Fix test that is flaky in Python 3 
We can't rely on lists having the same order in Python3 the same
way we rely on them in Python2. If we sort them first, and then
compare them, this test will be more reliable.
 2017-07-07 09:43:52 -06:00
rallytime
8d960d463a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/grains/core.py
 2017-07-06 17:42:30 -06:00
garethgreenaway
47ade9e91c Merge pull request #42088 from terminalmage/update-mocking 
Update mocking in network tests
 2017-07-06 15:03:42 -07:00
Jay
623ca64121 Merge branch 'develop' into patch-4 2017-07-06 16:58:53 -04:00
twangboy
8260a71c07 Disable tests that require pwd in Windows 2017-07-06 13:19:40 -06:00
Gareth J. Greenaway
a34970b45b Back porting the fix for 2017.7 that ensures the order of the names parameter. 2017-07-06 12:12:50 -07:00
twangboy
832a3d86dd Skip tests that use os.symlink on Windows 2017-07-06 13:11:02 -06:00
Nicole Thomas
b869ae5579 Merge pull request #42101 from rallytime/haproxyconn-tests 
[PY3] Fix haproxyconn unit tests that are failing
 2017-07-06 12:17:46 -06:00
Mike Place
30f04a7224 Merge pull request #42138 from rallytime/py3-saltmod-tests 
[PY3] Make test_saltmod unit tests less flaky for Python 3
 2017-07-06 11:47:20 -05:00
Nicole Thomas
c87d1edd0c Merge branch 'develop' into haproxyconn-tests 2017-07-06 10:22:33 -06:00
twangboy
00d9a52802 Fix problem with handling REG_QWORD in list values 2017-07-05 17:44:06 -06:00
twangboy
4ee24202fc Fix unit tests for test_pip 2017-07-05 15:49:53 -06:00
rallytime
cdfcc854ad [PY3] Make test_saltmod unit tests less flaky for Python 3 
Separates out the comment from the rest of the state return to make this
test more stable on Python 3. This state run in PY3 adds the minion
names to the comment in a random order, so we can't rely on asserting
against this order in the test.

This PR updates the test so that we are still checking for all of the
elements in the comment, but not relying on the order the minions are
added the comment list.
 2017-07-05 12:56:03 -06:00
Erik Johnson
d15f7ded82 Add integration test for 42116 2017-07-05 11:07:38 -05:00
Jay
11777e7641 Merge pull request #1 from saltstack/develop 
Update branch to latest
 2017-07-05 11:16:25 -04:00
rallytime
8b35b367b3 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/dockerng.py
 2017-07-05 09:14:30 -06:00
Erik Johnson
9a268949e3 Add integration test for 42116 2017-07-05 00:48:50 -05:00
Jay
0d7cadb1f2 Update test_win_service.py 
Added StartTypeDelayed to mock_info return for test_enable.
 2017-07-03 18:59:29 -04:00
rallytime
291515e445 [PY3] Fix haproxyconn unit tests that are failing 
``assertItemsEqual`` does not exist in Python 3. It was removed. Since
``assertItemsEqual(a, b)`` is the same thing as asserting that
``sorted(a) == sorted(b)``, we can just update the test in this manner
to work in both Python 2 and 3.
 2017-07-03 16:25:57 -06:00
Erik Johnson
fc27c1a948 Update mocking in network tests 
017fbdb changed the function calls in such a way that tests in 2017.7
now fail. This updates the mocking to account for new code paths
introduced in this commit.
 2017-07-03 10:43:34 -05:00
rallytime
4d96cc1068 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-07-03 09:28:18 -06:00
Erik Johnson
d942752e95 Fix usage of assert_called_once in Python 3 < 3.6 
This is a more complete fix which builds upon 41c65b0 and covers all
refs to assert_called_once in the suite.
 2017-07-03 09:30:12 -05:00
Mike Place
5b2ae2dd04 Merge pull request #42062 from terminalmage/arch-grains-test 
Add debug logging for grains tests
 2017-06-30 16:58:15 -05:00
Mike Place
d36f0ec0f0 Merge pull request #42051 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-06-30 15:54:53 -05:00
Erik Johnson
3071bb7a37 Add debug logging for grains tests 
The assert doesn't tell us anything about the grain that is failing.
This adds some debug logging to make this easier to troubleshoot.
 2017-06-30 15:39:48 -05:00
rallytime
f0416acc37 Add mode back in for tmp file creation on Linux 
The mode arg was removed in PR #41966 to get this test to pass on
Windows. However, this caused the same test to fail on Arch Linux
when running Python 3.

Let's keep the test the way it was for non-windows boxes, and only
remove the mode for windows.
 2017-06-30 12:06:54 -06:00
rallytime
9227a1263d Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-30 10:00:01 -06:00
Nicole Thomas
951ed4a9c9 Merge pull request #42032 from terminalmage/py3-tests 
Avoid race condition when iterating through processes
 2017-06-30 08:29:54 -06:00
Mike Place
32b73efd2d Merge pull request #42034 from rallytime/fix-41971 
Add the 'provider' key to salt.cloud.CloudClient.create()
 2017-06-30 09:01:19 -05:00
Andrew Bulford
9eea796da8 Add regression tests for #41982 
These test the scenarios where another network with a similar name
already exists, verifying that network_absent doesn't attempt to remove
a network which isn't specified, and network_present still attempts to
create the specified network despite a similarly named network already
being present.
 2017-06-30 11:03:45 +01:00
Andrew Bulford
3369f0072f Fix broken unit test test_network_absent 
This started failing following commit 515c612, which relied on the
'Name' key being present in the return value of dockerng.networks -
as the mock didn't have this set the test started failing.
 2017-06-30 11:01:10 +01:00
rallytime
80f53cd98c Replace cloud test __random_name funcs with new generate_random_name helper 2017-06-29 16:11:07 -06:00
rallytime
4a7073ac79 Add generate_random_name function to tests helpers 
This function is used identically in every cloud provider test file. Let's add
it to a more central place and make it more DRY. Might be useful in other testing
places as well.
 2017-06-29 15:43:03 -06:00
rallytime
a77e1bd9dd Add integration test for salt.cloud.CloudClient.create() function 2017-06-29 14:37:12 -06:00
Erik Johnson
d31939574b Avoid race condition when iterating through processes 
If a process has already exited between when psutil.process_iter() was
invoked, and when we invoke the cmdline() func, it will raise an
exception. This commit catches this exception and skips these processes.
 2017-06-29 15:08:17 -05:00
Erik Johnson
26f848e111 Mock socket.getaddrinfo in unit.utils.network_test.NetworkTestCase.test_host_to_ips 
This will keep future IP address changes from impacting this test. It
also tests a host which returns an IPv6 address, and a host which cannot
be resolved.
 2017-06-29 14:49:39 -05:00
twangboy
cdb53c2657 Set file_roots for Windows Temp 2017-06-29 13:01:10 -06:00
Mike Place
1b194904f3 Merge pull request #41992 from twangboy/win_unit_test_archive 
Fix `unit.modules.test_archive` on Windows
 2017-06-29 11:53:04 -05:00
Erik Johnson
9a50e7c1ca Merge remote-tracking branch 'upstream/2017.7' into merge-develop 2017-06-28 22:10:50 -05:00
Mike Place
9f3438d5e7 Merge pull request #42000 from terminalmage/merge-2017.7 
Merge 2016.11 into 2017.7 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7
 2017-06-28 21:44:22 -05:00
Erik Johnson
f13ddeb394 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7 
Conflicts:
- doc/_themes/saltstack2/layout.html
- salt/auth/__init__.py
- salt/utils/schedule.py
 2017-06-28 20:27:32 -05:00
Erik Johnson
94316114ee Add test for pyobjects priority 2017-06-28 19:48:46 -05:00
Erik Johnson
dfd0e51794 Update test_map to test declarative ordering 2017-06-28 19:48:46 -05:00
Erik Johnson
91576a7263 Introduce "priority" feature for pyobjects 
When there are multiple matches (such as when both an os_family and os
grain both match the minion), the order in which they are processed is
determined by the iteration order of the class' __dict__ attribute.
Since this would be different in different versions of Python, behavior
would be inconsistent depending on which version of Python is being used.

This adds a priority attribute to the Map subclass which, if present,
will re-order the match groups such that the results will be predictable
irrespective of Python version.
 2017-06-28 19:48:46 -05:00
Erik Johnson
fb6a93314f Update IP address for unit.utils.network_test.NetworkTestCase.test_host_to_ips 
The IP for saltstack.com changed, so this test needs to be updated.
 2017-06-28 19:42:52 -05:00
twangboy
a5f7288ad9 Skip test that uses pwd, not available on Windows 2017-06-28 15:35:35 -06:00
twangboy
bf20938f11 Fixes problem with path 2017-06-28 15:02:12 -06:00
rallytime
3c823109a1 Lint: Remove extra blank line 2017-06-28 13:29:31 -06:00
rallytime
9cb9547bc0 Rename transport_test file to test_transport and update imports for pytest 2017-06-28 11:35:13 -06:00
rallytime
e512a29f08 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/state.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - salt/version.py
  - tests/unit/config/test_config.py
  - tests/unit/modules/test_zypper.py
 2017-06-28 11:31:53 -06:00
rallytime
7d7be2d375 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/ref/configuration/master.rst
  - tests/integration/states/test_archive.py
  - tests/unit/transport/test_tcp.py
  - tests/unit/transport/test_zeromq.py
 2017-06-28 10:48:37 -06:00
garethgreenaway
4fe273f78e Merge pull request #41969 from twangboy/win_unit_test_config 
Fix `unit.config.test_config` for Windows
 2017-06-28 08:18:07 -07:00
garethgreenaway
7c96200e42 Merge pull request #41967 from twangboy/win_unit_test_api 
Fix `unit.config.test_api` for Windows
 2017-06-28 08:17:21 -07:00
twangboy
98bc208db9 Fix paths, skip impossible 2017-06-27 17:31:23 -06:00
Andreas Ulm
76fd941d91 added tests for rabbitmq 3.6.10 output handler 
Signed-off-by: Andreas Ulm <andreas.ulm@root360.de>
 2017-06-28 01:13:30 +02:00
twangboy
1f497d8f78 Fix paths 2017-06-27 16:43:54 -06:00
twangboy
3eca45e000 Fix unit tests for ssh 2017-06-27 15:29:44 -06:00
Mike Place
4209be843d Merge pull request #41959 from DSRCorporation/bugs/minor_dict_diff_enhance 
Minor dict diff enhance in tests.
 2017-06-27 15:18:16 -05:00
Mike Place
f9965ccfcb Merge pull request #41939 from cachedout/mdadm_py3_test 
Gate assert check behind mock ver
 2017-06-27 13:04:23 -05:00
Mike Place
e3bfd5a593 Merge pull request #41952 from meaksh/2017.7-suse-leftovers-part-two 
Fix "zypp_plugins" unit test for Python 3
 2017-06-27 12:42:00 -05:00
Dmitry Kuzmenko
e01e566779 Minor: show full dict diffs if test fails. 2017-06-27 16:22:09 +03:00
Pablo Suárez Hernández
7affbce83a Fix zypp_plugins unit test for Python 3 2017-06-27 09:26:35 +01:00
Mike Place
1c74b8909e Merge pull request #41942 from terminalmage/add-maxdiff 
Add maxDiff to pyobjects test for troubleshooting
 2017-06-26 13:01:30 -05:00
Mike Place
e28e10ded2 Merge pull request #41914 from vutny/fix-archive-extracted-local-file-hash 
archive.extracted: fix hash sum verification for local archives
 2017-06-26 12:59:27 -05:00
Erik Johnson
3fac9b3b06 Add maxDiff to pyobjects test for troubleshooting 2017-06-26 12:58:49 -05:00