Commit Graph

1032 Commits

Author SHA1 Message Date
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
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
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
Alexandru Bleotu
55e0092519 Merge branch 'develop' into list_cluster-gh 2017-09-16 18:00:18 +01: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
Alexandru Bleotu
d9b5424aab Merge branch 'develop' into list_cluster-gh 2017-09-15 20:04:33 +01: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
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
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
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
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
da16b6670a Merge pull request #42752 from skizunov/develop4
Add config option to ensure jid is unique
2017-09-11 13:38:30 -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
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
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
rallytime
5701d54516 Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/state.py
  - salt/utils/gitfs.py
2017-09-06 09:39:27 -04: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Daniel Wallace
c1f673eca4 use older name if _create_unverified_context is unvailable 2017-08-10 14:43:33 -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
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
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
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
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
Alexandru Bleotu
2218905cb7 Merge branch 'develop' into vmware_logs_and_no_permission_exc-gh 2017-07-25 23:38:01 +01: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
b2a2791534 Merge branch 'develop' into vmware_logs_and_no_permission_exc-gh 2017-07-24 20:30:58 +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
rallytime
0f5dd79aa0 Lint fixes 2017-07-18 12:46:15 -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
f59ecb7ffe Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/executors/sudo.py
2017-07-18 08:57:55 -06:00
Alexandru Bleotu
e783d6edd5 pylint 2017-07-18 06:44:34 -04: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
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
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
Erik Johnson
9a50e7c1ca Merge remote-tracking branch 'upstream/2017.7' into merge-develop 2017-06-28 22:10:50 -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
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
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
Dmitry Kuzmenko
596ab0421d Py3: pass Exception to side effect friendly for both mock<1.1 and mock>=1.1 2017-06-21 12:46:46 +03:00
Dmitry Kuzmenko
c25ebe3a6e Py3: fix test for Py34. Fixed the etcd util error case handling. 2017-06-20 21:47:51 +03:00
Ed Pelc
a536111b83 add tests for single docker log_config option fix 2017-06-16 14:57:17 -06:00
Ed Pelc
7480bab798 add tests for single docker log_config option fix 2017-06-16 13:05:01 -04:00
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/engines/slack.py
2017-06-15 10:57:27 -06:00
rallytime
16a2747d7d Merge branch '2016.11' into '2017.7'
Conflicts:
  - pkg/windows/buildenv/salt.bat
  - salt/modules/pillar.py
  - salt/utils/openstack/nova.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
  - tests/unit/cloud/clouds/test_gce.py
2017-06-14 13:31:42 -06:00
Loren Gordon
6e35673fe3 Preserves order when removing duplicates 2017-06-13 17:45:08 -04:00
Loren Gordon
18eda7084c Updates list merge tests to check for sorted, unique lists 2017-06-13 17:45:08 -04:00
rallytime
57166fd892 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-05-24 15:30:44 -06:00
rallytime
616ac7289b Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/config/__init__.py
  - salt/modules/elasticsearch.py
  - tests/integration/__init__.py
2017-05-23 10:36:41 -06:00
rallytime
718b0adc70 Merge branch 'nitrogen' into 'develop'
Conflicts:
  - salt/modules/zypper.py
  - tests/unit/utils/test_network.py
2017-05-23 09:05:13 -06:00
Mike Place
1ba95684a9 Merge pull request #41113 from cro/proxy_auto_test2
Rescue proxy_auto_tests PR from git rebase hell
2017-05-22 12:05:07 -05:00
rallytime
c6c1d30c48 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/yumpkg.py
  - salt/spm/__init__.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/utils/test_network.py
2017-05-20 17:07:34 -06:00
Bo Maryniuk
5f01e748e0 Fix Lint 2017-05-17 08:42:38 +02:00
Bo Maryniuk
2a60eae826 Add unit test for hostname can be started from 127 2017-05-16 16:21:31 +02:00
Bo Maryniuk
5168ef8959 Add unit test for hostname can be started from 127 2017-05-16 16:18:14 +02:00
Bo Maryniuk
1b28c67047 Add unit test for utilising host name as "127" 2017-05-16 12:17:13 +02:00
Bo Maryniuk
d9c8324a6b Unit test for accepting hosts names as 127 2017-05-16 12:07:32 +02:00
C. R. Oldham
19db038b99 Fix test--use proxy_config instead of minion_config 2017-05-12 14:01:54 -06:00
rallytime
f875ee3309 Merge branch 'nitrogen' into 'develop'
Conflicts:
  - tests/integration/runners/test_runner_returns.py
2017-04-28 09:26:26 -06:00
Pedro Algarvio
d65742c066
Delete attributes 2017-04-28 13:36:44 +01:00
Pedro Algarvio
abe608d739
Drop @patch usage 2017-04-28 13:36:42 +01:00
Pedro Algarvio
3bf84e2a4e
Rename classes in order not to be collected up by pytest 2017-04-28 13:33:34 +01:00
Pedro Algarvio
1d8f02f635
Drop @patch usage. Py3 Compat. 2017-04-28 13:33:32 +01:00
Nicole Thomas
b735b8f574 Merge pull request #40603 from kiorky/fix40602
Fix #40602: onfail_stop: test loop order is broken
2017-04-12 10:06:55 -06:00
Mike Place
5c2be60d7b Space for lint 2017-04-11 16:46:38 -06:00
Ronald van Zantvoort
24adf57814 DNS2: pylint fixes 2017-04-11 14:52:16 +02:00
Ronald van Zantvoort
4e573a93e6 DNS2: Add some docs 2017-04-11 13:17:51 +02:00
Ronald van Zantvoort
fba643a64f DNS2: Add nslookup tests 2017-04-11 13:11:35 +02:00
Ronald van Zantvoort
8e37eab1cb DNS2: Raise ValueError on wrong DNS type plus testing 2017-04-11 11:03:19 +02:00
Ronald van Zantvoort
f9d3fbb379 DNS2: Re-add DNSSEC test, add tests for host 2017-04-11 09:02:53 +02:00
Mathieu Le Marec - Pasquet
80d9482248 Fix #40602: onfail_stop: test loop order is broken 2017-04-10 10:22:03 +02:00
Ronald van Zantvoort
9dff676f8f DNS2: bugfixes, cleanup, drill tests 2017-04-06 10:13:01 +02:00
Ronald van Zantvoort
e3239d90cf DNS2: dig lookup testing 2017-04-06 10:13:00 +02:00
Ronald van Zantvoort
a30dd2ed0c DNS2: Add tests for getaddrinfo() 2017-04-06 10:13:00 +02:00
Ronald van Zantvoort
5a77b2520f DNS2: Add first batch of unit tests 2017-04-06 10:13:00 +02:00
Nicole Thomas
4d7871e4d7 Merge pull request #40494 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-04-05 14:15:05 -06:00
Pedro Algarvio
7b713d9256
Use the more portable helper skip_if_not_root. 2017-04-04 18:58:21 +01:00
Pedro Algarvio
dcf0a55daf
Use the test run temporary path, not the system temporary path 2017-04-04 18:58:21 +01:00
Pedro Algarvio
61003bca0a
Take care of resource leakage on tests 2017-04-04 18:58:20 +01:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration 2017-04-04 18:58:19 +01:00
Pedro Algarvio
8031ac0209
Move mixins to tests.support.mixins.
The adapted config mixin get config methods are not static methods
2017-04-04 17:29:34 +01:00
Mike Place
6056ee302a Merge pull request #40339 from s0undt3ch/features/py3-pt2
[WIP] Move unit tests which were in integration tests - More py3 and mocking fixes
2017-04-04 10:21:46 -06:00
rallytime
24e812add6 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/cache/__init__.py
  - salt/grains/core.py
  - salt/utils/gitfs.py
  - tests/unit/cache/test_localfs.py
  - tests/unit/modules/test_ssh.py
2017-04-03 10:17:11 -06:00
Pedro Algarvio
9fd126c904
Use a temporary configuration instead 2017-04-01 18:58:03 +01:00
Pedro Algarvio
4f068f5217
Misplaced test. Use tests.support.unit instead. 2017-04-01 14:23:00 +01:00
Pedro Algarvio
a15aa32404
Proper mocking. 2017-04-01 14:22:59 +01:00
Pedro Algarvio
9a11538b54
Stop using deprecated TestCase methods 2017-04-01 14:22:57 +01:00
Pedro Algarvio
f9b58aa2e2
This is not an integration test. Skip test.
Skipping tests since I have no clue what is supposed to be tested here
with that `raise Exception(ret)` at the end.
2017-04-01 14:22:53 +01:00
Pedro Algarvio
cde0af757e
Update tests to the new sorting 2017-04-01 14:22:53 +01:00
Pedro Algarvio
dc7169f8bd
Rename decorators in order not to be picked up by pytest as test cases 2017-04-01 14:22:53 +01:00
rallytime
0da4c46b68 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/utils/__init__.py
  - salt/utils/gitfs.py
  - tests/unit/modules/ssh_test.py
2017-03-31 09:59:59 -06:00
Mathieu Le Marec - Pasquet
0c7317e6ea Add a flag to mark onfail states as handlable 2017-03-31 00:22:59 +02:00
Mathieu Le Marec - Pasquet
fa2f9cf7bd Make returncode friendly to onfail requisites
Ensure that correctly handled states execution (via onfail)
will return a 0 code if onfail requisites suceed.
2017-03-31 00:22:51 +02:00
Nitin Madhok
dd62310941 Adding unit tests for vmware_test 2017-03-30 00:54:57 -04:00
Nitin Madhok
034ef30f7c Remove old vmware unit tests 2017-03-30 00:53:09 -04:00
Erik Johnson
cafa08d8e0 Add ability for salt.utils.path_join to force the use of posixpath
Also remove unused and unnecessary behavior from this function when the
first path component is of single length. An empty first parameter to
this function will normalze to "." and result in an incorrectly-joined
result.
2017-03-28 14:18:29 -05:00
Pedro Algarvio
d397763553
Adjust to the new LoaderModuleMockMixin usage 2017-03-28 19:03:59 +01:00
Pedro Algarvio
278275cf37
Fix StringVersion and LooseVersion. Add unit tests. 2017-03-28 19:00:52 +01:00
Pedro Algarvio
1f7a0aa65b
Proper mocking 2017-03-28 19:00:51 +01:00
rallytime
62b31d7620 Pylint fixes 2017-03-23 10:00:20 -06:00
rallytime
235a768872 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/returners/influxdb_return.py
  - salt/states/dockerng.py
  - salt/utils/schedule.py
  - tests/unit/modules/test_docker.py
  - tests/unit/states/dockerng_test.py
  - tests/unit/utils/test_schedule.py
2017-03-22 17:44:08 -06:00
Erik Johnson
5ad476936d Overhaul Docker support
This does the following:

- Splits states for container/volume/image/network management into four
  separate state modules.

- Preserves backward compatibility by making ``docker.image_present``
  invoke ``docker_image.present``, etc.

- Changes how Salt detects that a container needs to be replaced.
  Instead of comparing each passed argument to the named container's
  configuration, it creates a temporary container, and compares that
  container to the named container. If the two differ, then the older
  container is removed, and the new one is renamed and started, becoming
  the named container.

- Removes the unit tests for container management and replaces them with
  integration tests.

- Adds unit tests for the new salt.utils.docker
2017-03-21 16:53:19 -05:00
Bo Maryniuk
9e5bf58e42 Fix test: underscore alias is found 2017-03-21 10:49:18 +01:00
Bo Maryniuk
bceb6d0f56 Add with_deprecated test misconfiguration 2017-03-21 10:48:54 +01:00
Bo Maryniuk
54416ed2e8 Add with_deprecated test with opt-in policy configured 2017-03-21 10:47:26 +01:00
Bo Maryniuk
9f8bb257df Add with_deprecated test with opt-in policy by default 2017-03-21 10:46:53 +01:00
Bo Maryniuk
66dff82062 Fix unit test: log messages has been changed 2017-03-21 09:29:48 +01:00
Vyacheslav Spiridonov
9d5db1910c fix initial data structure for schedule tests 2017-03-15 21:02:08 +03:00
Vyacheslav Spiridonov
d3a2489c9c schedule tests to ensure pillar jobs are not modified 2017-03-15 18:36:15 +03:00
Pedro Algarvio
0b41b92d7d
Use salt.utils.versions instead of distutils.version 2017-03-08 19:22:33 +00:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt.
Let's drop the salttesting dependency cycle.
2017-02-28 22:52:49 +00:00
Pedro Algarvio
f9015ff1e4
Don't even try to concatenate non string types 2017-02-24 09:11:21 +00:00
Pedro Algarvio
b0794617c5
Fix unit.utils.test_warnings after the rename changes 2017-02-23 23:19:45 +00:00
Pedro Algarvio
cb7a25e4a2
Somehow salt.utils.boto3 is "landing" as boto3 in sys.modules 2017-02-23 23:19:43 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest. 2017-02-23 23:19:42 +00:00
Pedro Algarvio
e48ea8fa1b
Don't use assert_called_once() or assert_not_called().
These worked in Py2 but not in Py3.
A read of http://engineroom.trackmaven.com/blog/mocking-mistakes/ specially the section "Mocking the unexpected" will enlighten one.
2017-02-23 10:40:58 +00:00
Sergei Zviagintsev
ad5b52ce3c Add unit test for salt.utils.cloud.check_key_path_and_mode 2017-02-22 11:38:40 +01:00
Pedro Algarvio
20882bfcb4
These tests require root for default paths and create directories if non existing 2017-02-17 20:48:57 +00:00
Pedro Algarvio
c093d97a93
Only run the ascii case on Py2 2017-02-17 20:48:55 +00:00
rallytime
609e6e4b23 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/config/__init__.py
  - salt/modules/win_lgpo.py
  - salt/utils/aws.py
  - tests/unit/utils/schema_test.py
2017-02-09 10:29:40 -07:00
Erik Johnson
d35c2f810c salt.utils.gitfs: remove dulwich support, make refspecs configurable (#39210)
* Add config params for custom refspecs

* Add exceptions for errors encountered modifying git config

* Make the refspecs a configurable parameter

* Make refspecs a per-remote parameter

* Update master config template to include custom refspecs opts

* Add documentation for new config params

* Update GitFS walkthrough with a section on custom refspecs

* Remove dulwich support from salt.utils.gitfs

Dulwich still lacks important features, including (but not limited to)
the following:

- Lack of the necessary support for checking out a ref needed for
  git_pillar/winrepo support

- No support in its config objects for multivar git config items, making
  it impossible to detect when repos have multiple refspecs set for a
  given git remote

Given this information, and the fact that it trails as a distant third
to Pygit2 and GitPython, Salt will cease to support Dulwich as a git
interface moving forward.

* Excise references to dulwich from documentation

* Add mention of custom refspecs to Nitrogen release notes

* Add gitfs_refspecs to mocked opts in gitfs integration tests

Also remove dulwich from unit tests

* Add information about opts argument not being intended for CLI use
2017-02-09 09:50:45 -07:00
rallytime
a9c2c106c1 Pylint fix 2017-02-09 08:50:56 -07:00
rallytime
f6aad99db2 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/loader.py
  - salt/output/highstate.py
  - salt/runners/fileserver.py
2017-02-08 16:57:54 -07:00
Erik Johnson
1b9217d636 Update jsonschema tests to reflect change in jsonschema 2.6.0 (#39260)
Version 2.6.0 changed the wording of one of the exceptions tested,
causing tests to fail when jsonschema 2.6.0 is installed. This commit
updates the tests to change the assert for 2.6.0 and later.
2017-02-08 16:51:56 -07:00
rallytime
fc3c9182ae [PY3] Fix find module unit tests
These unit tests exposed a bunch of python 3 incompatibilities in the
filebuffer util as well as the find util. The filebuffer changes should
be reviewed carefully.
2017-01-27 14:59:24 -07:00
rallytime
e91fcbeaac Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/minion.py
  - salt/modules/dockerng.py
  - salt/thorium/key.py
2017-01-26 16:02:06 -07:00
Nicole Thomas
ca090fff1a Add new logging options to parsers_test mock for develop (#38974) 2017-01-26 12:47:23 -07:00
Bo Maryniuk
a112b790fe Fix typo 2017-01-25 21:15:05 +01:00
rallytime
49f57ba3f1 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/utils/win_functions.py
2017-01-25 09:59:29 -07:00
Bo Maryniuk
47a16916c3 Add unit test 2017-01-25 15:44:38 +01:00
Alexander Weidinger
30fe5641c7 fix parsing of sockstat -4 2017-01-22 02:06:25 +01:00
rallytime
3f74d697b9 Merge branch '2016.11' into 'develop'
Conflicts:
  - pkg/windows/build_pkg.bat
  - salt/modules/archive.py
2017-01-20 12:07:19 -07:00
rallytime
ce6d1b103d Make sure we're using the opts dict mocking in parsers_test
The additional call to parser.parse_args(args) negates the first
patch to running self.config_func. We want the opts that we set
up in the above test to patch the setup args when the parse_args
func is called. This updates the mock to work with better with
patch and removes the additional parser.parse_args call.
2017-01-20 10:20:51 -07:00
rallytime
315b2c8712 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/win_system.py
  - tests/unit/modules/win_system_test.py
2017-01-18 14:16:45 -07:00
Denys Havrysh
9bd203ffcc Fix #38388
If `log_level_logfile` is not set explicitly it should inherit the
level set by `log_level` configuration option.
2017-01-18 19:16:38 +02:00
rallytime
494a06bee2 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/configuration/minion.rst
2016-12-20 10:03:44 -07:00
Alexey Aksenov
42d3d26f28 [38073] Fix test assertion 2016-12-16 13:37:50 +03:00
Alexey Aksenov
9b37ead913 Fix broken os.write without string.encode
Fixes #38048
2016-12-16 13:33:59 +03:00
rallytime
05ec9f4b5b Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/netapi/rest_cherrypy/app.py
2016-12-15 20:47:35 -07:00
Alexey Aksenov
70c8db5489 Fix decoding of broken string from remote sources
Fixes #38070
Suggest to replace incorrect UTF symbols with the special replacement character.
This would simplily interation with broken things in the real world.
https://docs.python.org/3/howto/unicode.html#the-unicode-type
2016-12-15 14:33:33 +03:00
Alexandru Bleotu
7b0f6df8d8 Fixed test with new get_cluster call 2016-12-09 11:55:20 -05:00
Alexandru Bleotu
38b3ebf434 Fix pylint errors in tests for utils.vmware.get_hosts 2016-12-09 11:53:27 -05:00
Alexandru Bleotu
0ea033d21d Added tests for utils.vmware.get_hosts 2016-12-09 10:04:24 -05:00
rallytime
4998b8d116 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/peer.rst
  - doc/topics/reactor/index.rst
2016-12-07 16:31:11 -07:00
rallytime
342884018b Fix SaltKeyOptionParserTestCase test failures 2016-12-06 15:03:44 -07:00
Alexandru Bleotu
2f428ef38f Added tests for utils.vmware.get_datacenter 2016-12-05 10:38:11 -05:00
Alexandru Bleotu
e8a854f9ac Added tests for utils.vmware.get_datacenters 2016-12-05 10:37:48 -05:00
rallytime
74a417e527 Update the mocked cloud configs to also include master configs
The master configs are injected into the cloud configs, and we need
them here in order to get the `user` default for the parsers test.
2016-12-02 15:38:53 -07:00
rallytime
8fd53a4808 Merge branch '2016.3' into '2016.11'
Conflicts:
  - doc/topics/cloud/vsphere.rst
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/templates/rh_ip/network.jinja
  - salt/utils/parsers.py
  - tests/unit/daemons_test.py
2016-12-02 12:18:18 -07:00
Mike Place
0af7bd527d Merge pull request #37989 from alexbleotu/schema_updates-gh
Schema updates gh
2016-11-30 09:06:49 -07:00
Mike Place
fa41fa06cb Remove whitespace for lint check 2016-11-30 07:30:12 -07:00
Alexandru Bleotu
80baf38ee6 Added tests for new serialization code 2016-11-29 08:01:41 -05:00
Alexandru Bleotu
07979897b6 Added tests for InvalidArgument fault handling in utils.vmware.wait_for_task 2016-11-29 05:23:07 -05:00
Alexandru Bleotu
39fe0b41b6 Added/updated tests for exception handling/get_root_folder change in utils.vmware.get_content 2016-11-24 05:53:51 -05:00
Alexandru Bleotu
ed64348502 Added tests for exception handling in utils.vmware.is_connection_to_a_vcenter 2016-11-22 09:08:06 -05:00
Alexandru Bleotu
3497d2344e Added tests for exception handling in utils.vmware.get_service_instance 2016-11-22 09:08:06 -05:00
Alexandru Bleotu
102b2b2e98 Vmware disconnect gh (#37809)
* Added utils.vmware.disconnect

- disconnects from a vCenter or ESXi host

* Added tests for salt.utils.vmware.disconnect
2016-11-21 13:25:16 -07:00
Denys Havrysh
518a3dd7ee Add unit tests for Salt parsers processing logging options 2016-11-21 16:53:29 +02:00
rallytime
b86e9270e7 Update "warn" to "warning" in verify_test 2016-11-11 09:05:44 -07:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
2016-11-10 15:59:51 -07:00
Eric Radman
b19440418d Fixes to unit tests (#37586)
Add skipIf pyvmomi is not installed

    NameError: global name 'vmodl' is not defined
    NameError: global name 'vim' is not defined

Fix skipIf typo for OpenBSD

    >>> import sys
    >>> sys.platform
    'openbsd6'

Avoid warning from glusterfs.py:

    Use specific 'len(elem)' or 'elem is not None' test

Enable boto_secgroup_test tests that work now:

    test skipped due to error in moto return - fixed in
    cc01669643
2016-11-09 13:58:08 -07:00
Nicole Thomas
2e8e56ca69 [PY3] Change log.warn statements to log.warning (#37531)
* [PY3] Change log.warn statements to log.warning

log.warn is deprecated in Python 3. This change removes the
occurance of deprecation warnings for using log.warn. For example:

```
17:24:23 [WARNING ] /testing/salt/utils/verify.py:522: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead
17:24:23   log.warn('Insecure logging configuration detected! Sensitive data may be logged.')
17:24:23
17:24:23 [WARNING ] Insecure logging configuration detected! Sensitive data may be logged.
```

* Tweak unit.utils.verify_test to using warning instead of warn
2016-11-08 13:06:54 -07:00
Mike Place
610a198322
Lint 2016-11-08 19:40:48 +13:00
Mike Place
3e848ad126
Cache tests 2016-11-08 18:49:10 +13:00
Mike Place
33d0789f6e Merge pull request #37348 from alexbleotu/create_cluster-gh
Create cluster gh
2016-11-06 15:02:41 +13:00
Alexandru Bleotu
b3404ae7a2 Renamed salt.utils.vmware.update_cluster tests 2016-11-04 09:57:23 -04:00
Alexandru Bleotu
e126619405 Added tests for utils.vmware.create_cluster 2016-11-04 09:52:25 -04:00
Alexandru Bleotu
c68281b9fa Get cluster gh (#37310)
* Added utils.vmware.get_cluster

- retrieves a cluster in datacenter based on its name

* Added tests for utils.vmware.get_cluster
2016-11-02 08:28:41 -06:00
rallytime
e57fb947c6 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/modules/status.py
2016-11-01 12:56:04 -06:00
Alexandru Bleotu
b0aaebaab8 Update cluster gh (#37347)
* Added utils.vmware.update_cluster

- updates an existing cluster based on a configuration spec

* Added tests for utils.vmware.update_cluster
2016-11-01 09:01:20 -06:00
rallytime
e10058c831 Merge branch '2016.3' into 'carbon'
No conflicts.
2016-10-31 10:15:25 -06:00
Mike Place
7d7941598e
Merge branch 'carbon' into carbon_develop 2016-10-31 23:57:16 +13:00
Mike Place
02d61e5928
Lint 2016-10-31 23:21:43 +13:00
Mike Place
3d36f47d53
Skip process test on < 2.7
There is an unfixed bug in 2.6 that makes this unstable.
2016-10-31 23:20:48 +13:00
Mike Place
a6b7417fe9
SIGILL -> SIGKILL in process test
Fairly sure this was a typo. cc: @s0undt3ch
2016-10-31 20:54:42 +13:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
2016-10-28 11:58:41 -06:00
Mike Place
36f47a4449
Reset dir for extend test 2016-10-28 15:02:13 +09:00
Alexandru Bleotu
a777d6eced Get managed object name gh (#37276)
* Added get_managed_object_name to optimally retrieve a managed object's name

* Added tests for get_managed_obect_name
2016-10-27 16:27:27 -06:00
Alexandru Bleotu
c0b45afa54 Added tests for salt.utils.vmware.get_properties_of_managed_object 2016-10-26 06:37:32 -04:00
Mike Place
fa20c4c128 Merge pull request #37223 from alexbleotu/get_service_instance_from_managed_object-gh
Get service instance from managed object gh
2016-10-26 10:35:02 +09:00
Alexandru Bleotu
ac451002dd Added tests for get_service_instance_from_managed_object 2016-10-25 11:21:32 -04:00
rallytime
70851807bd Merge branch 'carbon' into 'develop'
Conflicts:
  - salt/modules/status.py
2016-10-24 09:35:00 -06:00
rallytime
caa8fc9169 Merge branch '2016.3' into 'carbon'
Conflicts:
  - pkg/deb/salt-api.service
  - pkg/deb/salt-master.service
  - salt/client/__init__.py
  - salt/fileclient.py
  - salt/modules/cp.py
  - salt/modules/status.py
  - tests/integration/__init__.py
  - tests/integration/modules/cp.py
2016-10-21 15:50:03 -06:00
rallytime
db3150b3f1 Merge branch 'carbon' into 'develop'
Conflicts:
  - doc/topics/installation/windows.rst
2016-10-21 15:19:16 -06:00
Dmitry Kuzmenko
4695619599 Updated host_to_ip to return all the IPs instead of the first one.
This fixes the bug #36866 where minion gets __master_disconnected right
after connect because '::1' isn't in the list of connected masters that
is ['127.0.0.1'].
2016-10-20 18:15:27 +03:00
Mike Place
d7aebd1877
Remove unnecessary sleep from unit.utils.process_test.TestProcessManager.test_restarting 2016-10-20 14:29:10 +09:00
rallytime
c4dc0dd2ef Merge branch 'carbon' into 'develop'
No conflicts.
2016-10-13 11:14:36 -06:00
Nicole Thomas
a8eee6e90b Update the ip to test against in unit.utils.network_test.NetworkTestCase.test_host_to_ip (#36975) 2016-10-13 10:25:58 -06:00
Tim Fechner
7547761acc Fix #36461, AttributeError because of .lower() (#36462)
* Fix #36461, AttributeError because of .lower()

* Add tests
2016-10-11 10:29:22 -06:00
Alexandru Bleotu
6c441cb288 Create datacenter gh (#36826)
*  Added salt.utils.create_datacenter that creates a VMWare datacenter

* Added tests for salt.utils.vmware.create_datacenter
2016-10-11 08:49:53 -06:00
Alexandru Bleotu
03533e9b01 Added tests for salt.utils.vmware.get_datacenter 2016-09-27 13:39:47 +01:00
Mike Place
681ce7539c Merge pull request #36511 from alexbleotu/wait_for_task_update-gh
Wait for task update gh
2016-09-26 19:04:35 +09:00
Mike Place
6af9192a51 Merge pull request #36509 from alexbleotu/get_root_folder-gh
Get root folder gh
2016-09-26 18:52:50 +09:00
Alexandru Bleotu
16510be521 Updated tests to reflect changes in salt.utils.vmware.wait_for_pid 2016-09-23 10:48:24 +01:00
Alexandru Bleotu
fa2ecb9f56 Added tests for get_root_folder 2016-09-23 10:09:10 +01:00
rallytime
8e0b1a3718 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-22 10:09:06 -06:00
C. R. Oldham
755c069fb9 Align tests for new calls 2016-09-21 16:08:28 -06:00
C. R. Oldham
3c62ceb3b4 Fix salt-cloud breakage--local traversal was skipping what we needed. Fixes #36301
Align tests for new calls
More specific 'skip' selection for PropertyCollector depending on local_properties request.
2016-09-21 09:43:14 -06:00
rallytime
bdb15217d3 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-19 11:21:02 -06:00
Nicole Thomas
2f16e43d67 Update the extend.py and extend_test.py imports (#36382)
When using `fopen`, we need to import all of salt.utils. We should
also be explicit about calling salt.utils.fopen.

This also cleans up the ordering of the salttesting vs salt libs to
be consistent with other files and conform with `ensure_is_syspath`.

Also changes a print statement to a log.info
2016-09-16 16:26:13 -06:00
rallytime
26cf545d03 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/utils/gitfs.py
  - tests/unit/modules/disk_test.py
2016-09-16 10:35:49 -06:00
rallytime
37aea4188a Merge branch '2015.8' into '2016.3'
No conflicts.
2016-09-16 09:24:17 -06:00
Mike Place
70ffdafbf0 Schema test requires jsonschema 2.5.0 or above 2016-09-15 17:23:51 -06:00
Mike Place
340d7fdc53 Schema test requires jsonschema 2.5.0 or above 2016-09-15 12:20:49 -06:00
rallytime
47e5d94710 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-15 11:26:09 -06:00
Mike Place
93f2d108ae Fix extend test
The test suite can't guarantee what the pwd will be. Pass it into the function under test.
2016-09-15 20:39:39 +09:00
Mike Place
1357244ef9 Schema test requires jsonschema 2.5.0 or above 2016-09-14 19:03:13 +09:00
Pablo Suárez Hernández
52a7ed605e Fixed _interfaces_ifconfig output for SunOS test 2016-09-08 12:39:28 +01:00
Eric Radman
29814f9d43 Skip utils_test if timelib is not installed (#32699)
date_cast() throws a RuntimeError, not an ImportError
2016-09-08 12:39:28 +01:00
Pablo Suárez Hernández
305bab8be0 Fixed _interfaces_ifconfig output for SunOS test 2016-09-08 11:36:17 +01:00
Eric Radman
5977f1f54c Skip utils_test if timelib is not installed (#32699)
date_cast() throws a RuntimeError, not an ImportError
2016-09-08 11:36:17 +01:00
Justin Anderson
3f7e4d9f59 traversal_spec has skip=True, not false (#35877) 2016-08-29 16:12:16 -06:00
Nicole Thomas
27697e952a Pylint fixes for develop branch (#35863) 2016-08-29 12:20:50 -06:00
Mike Place
409f17aa58 Merge pull request #35673 from cro/proxy_getsi_fix
Proxies don't handle reusing the SmartConnect instances very well.  D…
2016-08-29 13:11:35 +09:00
Mike Place
5bb62345f6 Merge pull request #35728 from alexbleotu/vmware_enhancements-gh
Vmware enhancements gh
2016-08-29 12:54:14 +09:00
rallytime
2b1ad9e9b9 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/utils/gitfs.py
2016-08-26 14:54:54 -06:00
rallytime
e8e73b55ac Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/jobs/schedule.rst
  - salt/states/user.py
2016-08-26 13:21:12 -06:00
Erik Johnson
eb4d2f299b Better unicode handling in gitfs (#35802)
* Revert "Don't use six.text_type() in salt.utils.gitfs"

This reverts commit d76659a63a.

* salt.utils.path_join: handle mixed unicode/binary-unicode paths

* Add test for mixed unicode and binary-unicode paths

* salt.utils.gitfs: replace os.path.join with salt.utils.path_join
2016-08-26 10:44:22 -06:00
Alexandru Bleotu
e993f99053 Improved salt.utils.vmware.get_content, get_mors_with_properties
- added optional traversal_spec parameter to both methods, allowing the
  user to specify a different TraversalSpec object to search for content
  (if not specified, the behaviour is that all a traverse all search is
  done)
- the traversal_spec is destroyed only if is created in the method
- added local_properties flag to both methods allowing the retrieval of
  properties of the container object
- added tests for the 2 functions
2016-08-25 10:42:48 +01:00
C. R. Oldham
ae9b2726b5 Fix some spelling, add better test for proxy 2016-08-23 16:42:14 -06:00
Alexandru Bleotu
e66841ef69 Improved salt.utils.vmware.wait_for_task
- improved logging/description
- on success the method returns the result and on error it raises the
  exception it got from vmware
- added unit tests
2016-08-23 17:07:54 +01:00
C. R. Oldham
424a9a8137 Merge pull request #34059 from alexbleotu/vmware_common-gh
Vmware common gh
2016-08-23 09:24:15 -06:00
Alexandru Bleotu
77e6e5afee Improved connection to a VMware vCenter Server or ESXi host
- added support for passthrough connections via SSPI
- added function to specify if a connection is made to a vCenter or ESXi host
- added function to disconnect from a vCenter or ESXi host
- added tests for changed/new functions
2016-08-23 13:46:28 +01:00
Mike Place
0dc7348f1d Mock sys.exit in salt.utils.extend
Best not to push an exit into the test suite :]
2016-08-22 21:37:40 +09:00
rallytime
7b3fc41868 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/cloud/clouds/lxc.py
  - salt/cloud/clouds/nova.py
  - salt/cloud/clouds/vmware.py
  - salt/cloud/clouds/vsphere.py
  - salt/cloud/libcloudfuncs.py
  - salt/minion.py
  - salt/modules/yumpkg.py
  - salt/utils/cloud.py
2016-08-18 14:37:42 -06:00
rallytime
e61b04a707 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/clouds/digital_ocean.py
  - salt/cloud/clouds/ec2.py
  - salt/cloud/clouds/libcloud_aws.py
  - salt/cloud/clouds/opennebula.py
  - salt/cloud/clouds/rackspace.py
  - salt/cloud/clouds/softlayer.py
  - salt/cloud/clouds/softlayer_hw.py
  - salt/cloud/clouds/vmware.py
  - salt/loader.py
  - salt/modules/aptpkg.py
  - salt/modules/ebuild.py
  - salt/modules/pacman.py
  - salt/modules/systemd.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/scripts.py
  - salt/utils/cloud.py
2016-08-18 12:09:51 -06:00
Erik Johnson
f83e0ef242 Add unit tests for salt.utils.systemd 2016-08-17 11:30:14 -05:00
rallytime
49179ac401 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/win_pkg.py
  - tests/integration/files/conf/master
2016-08-16 12:52:20 -06:00
rallytime
c6c82be1de Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/deploy/bootstrap-salt.sh
2016-08-16 11:02:05 -06:00
Graham McCullough
ae5b233d51 fixes #34279 2016-08-15 14:34:20 -07:00
Mihai Dinca
b0f0b4effc Make sha256 the default hash_type 2016-08-15 10:02:19 +02:00
rallytime
1fe0b69a6c Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/blockdev.py
  - salt/modules/ddns.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/linux_sysctl.py
  - salt/modules/status.py
  - salt/modules/x509.py
  - salt/utils/process.py
  - salt/utils/verify.py
  - tests/integration/__init__.py
  - tests/integration/modules/state.py
  - tests/integration/states/cmd.py
2016-08-12 16:21:58 -06:00
rallytime
cf038ee3fe Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/grains/core.py
  - salt/modules/file.py
  - salt/modules/hosts.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/portage_config.py
  - salt/modules/x509.py
  - salt/scripts.py
  - tests/integration/shell/enabled.py
2016-08-11 11:33:54 -06:00
Erik Johnson
a375dd7e1f Clean up open filehandles (#35359)
* salt/crypt.py: clean up open filehandles

* salt/fileclient.py: clean up open filehandles

* salt/grains/core.py: clean up open filehandles

* salt/modules/cp.py: clean up open filehandles

* salt/modules/data.py: clean up open filehandles

* salt/modules/dnsutil.py: clean up open filehandles

* salt/modules/dockerng.py: clean up open filehandles

* salt/modules/inspectlib/collector.py: clean up open filehandles

* salt/modules/file.py: clean up open filehandles

* salt/modules/hosts.py: clean up open filehandles

* salt/modules/incron.py: clean up open filehandles

* salt/modules/dpkg.py: clean up open filehandles

* salt/modules/linux_sysctl.py: clean up open filehandles

* salt/modules/netbsd_sysctl.py: clean up open filehandles

* salt/modules/network.py: clean up open filehandles

* salt/modules/nftables.py: clean up open filehandles

* salt/modules/openbsd_sysctl.py: clean up open filehandles

* salt/modules/rh_ip.py: clean up open filehandles

* salt/modules/portage_config.py: clean up open filehandles

* salt/modules/status.py: clean up open filehandles

* salt/modules/tls.py: clean up open filehandles

* salt/modules/xapi.py: clean up open filehandles

* salt/modules/x509.py: clean up open filehandles

* salt/modules/virt.py: clean up open filehandles

* salt/modules/zcbuildout.py: clean up open filehandles

* salt/returners/local_cache.py: clean up open filehandles

* salt/utils/cloud.py: clean up open filehandles

* salt/states/pkgrepo.py: clean up open filehandles

* salt/states/x509.py: clean up open filehandles

* salt/transport/mixins/auth.py: clean up open filehandles

* salt/utils/__init__.py: clean up open filehandles

* salt/states/pkg.py: clean up open filehandles

* salt/utils/minion.py: clean up open filehandles

* salt/utils/openstack/nova.py: clean up open filehandles

* salt/utils/openstack/swift.py: clean up open filehandles

* salt/utils/process.py: clean up open filehandles

* salt/utils/templates.py: clean up open filehandles

* salt/utils/virt.py: clean up open filehandles

* tests/integration/__init__.py: clean up open filehandles

* tests/integration/cli/grains.py: clean up open filehandles

* tests/integration/client/standard.py: clean up open filehandles

* tests/integration/modules/hosts.py: clean up open filehandles

* tests/unit/utils/vt_test.py: clean up open filehandles

* tests/integration/shell/enabled.py: clean up open filehandles

* tests/integration/states/cmd.py: clean up open filehandles

* tests/integration/states/file.py: clean up open filehandles

* tests/integration/states/match.py: clean up open filehandles

* tests/unit/config_test.py: clean up open filehandles

* tests/unit/templates/jinja_test.py: clean up open filehandles

* tests/unit/utils/find_test.py: clean up open filehandles

* tests/integration/modules/state.py: clean up open filehandles

* Update dnsutil_test to reflect changes in fopen usage
2016-08-11 10:45:24 -06:00
Justin Findlay
2fc3a55338 utils.verify.verify_log: warn at all levels less than info 2016-08-10 14:10:43 -06:00
Daniel Wallace
09c5088c3c [PY3] fix warnings_test
maxint is not available in py3.  It was removed, but maxsize can be used
instead.

https://docs.python.org/3.1/whatsnew/3.0.html#integers
2016-08-02 10:25:35 -05:00
Daniel Wallace
445c7a2c20 [PY3] python3ize schema test
thirsty is specified as a boolean

need to copy the top level of kwargs so that the dictionary does not
changes size during the loop.
2016-08-02 10:25:35 -05:00
Daniel Wallace
f5b1769e0b [PY3] bytes for events_test 2016-08-02 10:25:35 -05:00
Erik Johnson
bd4d1d31a0 Add nodegroup_comp unit tests 2016-07-29 19:28:52 -05:00
Anthony Shaw
87954a2baf
add newline to test 2016-07-28 12:44:01 +10:00
Anthony Shaw
bc528eb4d0
completed test to check files, names and contents 2016-07-28 11:52:16 +10:00
Anthony Shaw
b7257baade
add test class 2016-07-28 11:41:15 +10:00
Bo Maryniuk
87ffd6dc1e Regression fix: minion ID generator should use FQDN first, if available (#34876)
* Regression fix: use FQDN first, if available

* Adjust the tests to the new behaviour (FQDN first)
2016-07-22 09:21:42 -06:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
2016-07-07 13:37:58 -06:00
rallytime
27988dde48 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
2016-07-07 12:31:12 -06:00
Nicole Thomas
3ebba020b6 Rename some unit test files by adding _test (#34503)
These two test files are currently not running automatically on Jenkins.
Renaming these files will add them to the full runtests.py run.
2016-07-07 12:05:08 -04:00
Jonathon Anderson
ed74415155 Addressed unit testing for salt.utils.find
In addition to addressing test failures introduced by this
bugfix branch, I've also added additional tests for the
proper behavior of min/maxdepth.
2016-06-24 14:06:17 -06:00
Hatem Nassrat
9f16d6019c Fixes #34181 no more newlines in long yaml encodes 2016-06-22 18:35:19 +00:00
Henrik Holmboe
523b2acae9 return_valute -> return_value (#34091) 2016-06-17 13:02:07 -04:00