valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,659 Commits 24 Branches 182 Tags 341 MiB
06c46b48f3
Commit Graph

9893 Commits

Author SHA1 Message Date
Petr Michalec
ab1dd446e7
Endpoint handling per region, fixes #35874 
- extend tests for multiple regions
- region arg by default set to None
- print verbose changes to be exec.
 2017-04-21 15:48:52 +02:00
Mike Place
8652ad68c8 Merge pull request #40753 from arno01/dockerng-enhanced 
dockerng: avoid network duplication and add driver_opts
 2017-04-21 05:21:33 -06:00
Andrey Arapov
4c29c5f6ab
dockerng: avoid network duplication and add driver_opts 2017-04-21 08:52:55 +02:00
rallytime
d5b1241972 Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict 
he pip junos-eznc package, when installed with PyOpenSSL version 0.14 causes
this test failure. If you either remove junos-eznc, or upgrade PyOpenSSL
(current is 0.17) the test is happy. So, we need to handle this case in the test.
 2017-04-20 17:02:33 -06:00
rallytime
55c947adf4 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-20 13:44:37 -06:00
rallytime
bad421be66 Update managed.sls test file: osmajorrelease grain is an int now 
We need to make the comparison in the file to `7` instead of `'7'`,
otherwise the state doesn't execute correctly and the test_pkgrepo
test will fail because the state didn't run.
 2017-04-20 12:27:45 -06:00
Mike Place
ba2e7dd4f6 Merge pull request #40697 from DSRCorporation/bugs/35691_cache_full_ret 
Keep all return-related values in the job cache.
 2017-04-20 11:57:27 -06:00
Erik Johnson
e03698fbeb Add git_pillar integration tests 
This also adds a new section to the runtests.py so that ext_pillar
integration tests can be run separately.
 2017-04-20 03:51:08 -05:00
Erik Johnson
7cef07b0d9 Remove legacy git_pillar tests 
Also remove git_pillar configuration from the test suite's master
configuration file.
 2017-04-20 03:51:08 -05:00
Steve Groesz
715df9a911 Add test for new kernelversion grain 2017-04-19 17:46:00 -05:00
Pablo Suárez Hernández
bd1f170a05 Fixes Zypper unit test 2017-04-19 10:18:46 +01:00
rallytime
0616405104 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-18 16:43:11 -06:00
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-04-18 16:42:30 -06:00
Nicole Thomas
d0b90058c4 Merge pull request #40706 from twangboy/fix_whitelist 
Remove non-existent tests from whitelist
 2017-04-18 10:30:55 -06:00
Mike Place
2ab95b7dd5 Set minion test to use default opts 2017-04-18 08:34:57 -06:00
Dmitry Kuzmenko
f9d2c4da8f Minor: unit test fix. 2017-04-18 11:56:20 +03:00
twangboy
e4876abcde Add back the two loader tests 2017-04-17 14:04:20 -06:00
rallytime
292f55600b Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/fileserver/s3fs.py
  - tests/unit/test_fileclient.py
 2017-04-17 13:32:56 -06:00
rallytime
885419b3e7 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-17 13:27:58 -06:00
Mike Place
f7b062acd7 Merge pull request #40266 from meaksh/develop-pkg-improvements 
[develop] Adding "pkg.downloaded" state and support for installing patches/erratas
 2017-04-17 11:34:42 -06:00
Pablo Suárez Hernández
fa9e7f01f7 Pylint fix 2017-04-17 14:18:09 +01:00
Pablo Suárez Hernández
40422ecd02 Adding more unit tests for Zypper module 2017-04-17 13:06:35 +01:00
Pablo Suárez Hernández
5701e90803 Adding unit tests for Zypper execution module 2017-04-17 13:02:08 +01:00
twangboy
9d7f78e896 Remove non-existent tests from whitelist 2017-04-14 14:35:06 -06:00
Nicole Thomas
77028a6c4e Merge pull request #40685 from Ch3LL/fix_mac_file 
Fix errno code for filecache test for other operating systems.
 2017-04-14 10:54:25 -06:00
rallytime
9905eb7273 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/netapi/__init__.py
 2017-04-14 10:50:31 -06:00
rallytime
f552dd63f3 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - pkg/windows/installer/Salt-Minion-Setup.nsi
  - tests/unit/states/test_tomcat.py
 2017-04-14 10:46:56 -06:00
Ch3LL
9ea6e8b456
remove io and change to EROFS 2017-04-13 18:10:44 -04:00
Ch3LL
688791ff60
remove try-except and change errno 2017-04-13 17:06:44 -04:00
Mike Place
ad4d6839fd Merge pull request #40675 from gtmanfred/2016.11 
use loader for getting war version
 2017-04-13 13:58:30 -06:00
rallytime
e440d2e8af Use self.setGrains as context manager in grains test 2017-04-13 13:39:11 -06:00
Nicole Thomas
88f514835d Merge pull request #40677 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-13 13:19:07 -06:00
Ch3LL
e30afc4c01
add exception type 2017-04-13 15:06:12 -04:00
Ch3LL
acf333df08
change errno code for fileclient test 2017-04-13 14:56:45 -04:00
rallytime
3d6c983c69 Remove unused import for lint 2017-04-13 11:52:20 -06:00
Daniel Wallace
a61fc824c4 use loader for war extraction 
Also set the version added in the docs
 2017-04-13 11:51:22 -06:00
rallytime
17efc7341c Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_wua.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/version.py
  - tests/unit/states/grains_test.py
  - tests/unit/states/test_archive.py
 2017-04-13 10:14:51 -06:00
Ch3LL
60724980ec
fix test_fstype test for mac 2017-04-13 12:04:20 -04:00
Mike Place
5668cc39de Merge pull request #39802 from cachedout/random_startup_delay 
A random startup delay option for minions
 2017-04-13 09:53:06 -06:00
rallytime
5282ea2480 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-13 09:46:05 -06:00
Mike Place
92b5f03beb Merge pull request #40551 from terminalmage/issue39868 
Fix four issues in archive.extracted state
 2017-04-12 12:37:51 -06: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
Daniel Wallace
b0bd99c26d add comment and unit test 2017-04-11 21:08:06 -06:00
Mike Place
4af8d08e43 Merge pull request #40581 from terminalmage/release_notes 
Make scheduled change to osmajorrrelease grain, clean up Nitrogen release notes
 2017-04-11 16:49:15 -06:00
Mike Place
5c2be60d7b Space for lint 2017-04-11 16:46:38 -06:00
rallytime
749840ce5f Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-11 15:11:46 -06:00
rallytime
cd0adb82d6 Spelling fix 2017-04-11 13:35:38 -06:00
rallytime
36f7a6481b Remove blacklisted loader usage of dunder variables 2017-04-11 12:16:15 -06:00
Erik Johnson
20f856f038 Update unit tests for numeric osmajorrelease 2017-04-11 12:36:36 -05:00
Mike Place
33a6224dcf
Set minion test to use default opts 2017-04-11 09:28:19 -06:00
Mike Place
96870141b0 Merge pull request #40555 from The-Loeki/dns-enh 
DNS utils p3
 2017-04-11 08:58:16 -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
rallytime
67d08f60ff Fixup fileclient_test file to conform to new standards 2017-04-10 14:09:41 -06:00
rallytime
2cd0c5e4ec Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
  - tests/unit/modules/test_pillar.py
 2017-04-10 14:09:25 -06:00
Chris Heald
5139275602 Add env support for rvm.installed and rvm.do, opts support for .installed 
Currently, the RVM state has no way to pass environment variables (ie, RUBY_CONFIGURE_OPTS)
or compilation flags (-C, --patch) to the Ruby installer. This patch enables this
functionality, permitting installation of customized Ruby installs. For example, the following
should now work:

   ruby-2.3.0:
     rvm.installed:
       - env:
           - RUBY_CONFIGURE_OPTS: --with-jemalloc
       - opts:
           - '--patch /path/to/my.patch'
           - '-C --enable-shared,--with-readline-dir=$HOME/.rvm/usr'
 2017-04-10 12:40:56 -07:00
Erik Johnson
5ea1f607b0 Fix mocking in unit tests 2017-04-10 13:57:39 -05:00
Nicole Thomas
93818257cb Merge pull request #40591 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-10 12:07:16 -06:00
rallytime
4957f7753e Fixup fileclient_test file to conform to new standards 2017-04-10 10:30:33 -06:00
Mathieu Le Marec - Pasquet
80d9482248 Fix #40602: onfail_stop: test loop order is broken 2017-04-10 10:22:03 +02:00
Mike Place
72f83706bf Merge pull request #40569 from nevins-b/minor_pip_fix 
only look at stdout when doing pip --version
 2017-04-07 12:53:18 -06:00
rallytime
5a419b8aae Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pillar.py
 2017-04-07 11:23:41 -06:00
rallytime
4a75675d07 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
 2017-04-07 11:20:51 -06:00
Erik Johnson
f8bc423ef9 Merge pull request #40563 from terminalmage/merge-2016.3-2016.11 
Merge-forward 2016.3 -> 2016.11
 2017-04-07 10:08:19 -05:00
Erik Johnson
0c608d7417 Add client_args_mock back to test 
I removed this incorrectly in resolving a merge conflict.
 2017-04-07 08:50:45 -05:00
Mike Place
83f6d3d3bb Merge pull request #40567 from terminalmage/fix-pillar-get-merge-lists 
Allow pillar.get to merge list as well as dictionaries
 2017-04-06 15:54:16 -06:00
Mike Place
d349e35fad Merge pull request #40570 from cachedout/pkg_test_flaky 
Add flaky decorator to pkg tests
 2017-04-06 15:52:32 -06:00
Nevins Bartolomeo
b3a4d016c9 Mock cmd.run_stdout not cmd.run 2017-04-06 16:48:10 -04:00
Nicole Thomas
ae13de622a Merge pull request #40451 from isbm/isbm-fileclient-testcase-2016.11 
Fileclient testcase (2016.11)
 2017-04-06 13:53:30 -06:00
Mike Place
69058ae67a
Add flaky decorator to pkg tests 2017-04-06 12:22:40 -06:00
Mike Place
56363bc41c Merge pull request #40462 from cachedout/state_expect_minions 
Fix orch state when no minions return
 2017-04-06 11:58:14 -06:00
Erik Johnson
cb4db56eb5 Allow pillar.get to merge list as well as dictionaries 
This also gets rid of the exception that used to be raised when the
default was not of the proper type, and instead skips merging in those
cases.
 2017-04-06 12:24:22 -05:00
Mike Place
60750a1619
Fix test 2017-04-06 10:48:27 -06:00
Erik Johnson
a6d68f50fe Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11 2017-04-06 10:15:47 -05: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
Pedro Algarvio
2d32fab65b
Don't instantiate the log handler if unable to connect to server 2017-04-05 23:29:13 +01:00
Pedro Algarvio
0b2364e57d
White-space lint fix 2017-04-05 23:19:53 +01:00
Pedro Algarvio
281e0cafb2
Fix resource leakage 2017-04-05 23:18:00 +01:00
Pedro Algarvio
843e218572
Remove unmocked patching 2017-04-05 23:17:36 +01:00
Pedro Algarvio
eb588c772a
Add missing futures import 2017-04-05 23:16:52 +01:00
Bo Maryniuk
aba94495a5 Lintfix (Py3 code compat) 2017-04-05 22:56:29 +02:00
Ch3LL
7710355e3a
check for salt install fail on vultur test 2017-04-05 14:39:31 -06: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
rallytime
71f3c73150 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/template.py
  - salt/utils/pycrypto.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_artifactory.py
  - tests/unit/test_template.py
 2017-04-05 13:02:14 -06:00
Nicole Thomas
59db716817 Merge pull request #40510 from twangboy/deprecate_win_update 
Add deprecation warnings to win_update state and execution modules
 2017-04-05 11:47:56 -06:00
Mike Place
ee5f891002 Merge pull request #40523 from s0undt3ch/features/py3 
[WIP] A Little House Keeping and Addressing Py3 test suite leakage
 2017-04-05 10:58:32 -06:00
Pedro Algarvio
94d944da52
Limit the size of the log records queue 2017-04-05 16:38:05 +01:00
Pedro Algarvio
0dbab2e07a
Get some more insights on memory consumption 2017-04-05 16:38:04 +01:00
twangboy
70b61dda39 Fix unit tests, spell Fluorine correctly 2017-04-04 23:42:36 -06:00
Pedro Algarvio
0c61c151c3
Fix state logic 2017-04-05 02:07:54 +01:00
Pedro Algarvio
de5fdc6ba8
Purge the account 2017-04-05 00:51:35 +01:00
Pedro Algarvio
cd1f7ba629
Let's use the system temp dir as it was to see if it fixes the test failure 2017-04-05 00:34:39 +01:00
Erik Johnson
78b4798b1b Update compile_template test to use StringIO 2017-04-04 15:41:43 -05:00
Erik Johnson
a6183d93d3 Preserve windows newlines in salt.template.compile_template() 
Test included.
 2017-04-04 15:41:43 -05:00
Mike Place
8da27c9e1d Merge pull request #40306 from terminalmage/issue40279 
Don't use context caching for gathering systemd services
 2017-04-04 14:36:38 -06:00
Mike Place
0ed385210f Merge pull request #40465 from rallytime/fix-37699 
Artifactory Execution & State Module: Fixup Error Handling
 2017-04-04 14:12:21 -06:00
Mike Place
778c1c94bd Merge pull request #40522 from carlpett/vault-fix-master-minion 
Salt-vault: Fix handling of None-grains
 2017-04-04 13:33:56 -06:00
Pedro Algarvio
c3417213d7
Make sure the socket's used are closed 2017-04-04 19:28:06 +01: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
9bbfd6605c
Fix state files temporary path 2017-04-04 18:58:21 +01:00
Pedro Algarvio
de9ccbdb43
Fix mocked test 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
e6f43b46c0
Import from the original modules 2017-04-04 18:58:20 +01:00
Pedro Algarvio
42e35e13cc
Use mock to patch 2017-04-04 18:58:20 +01:00
Pedro Algarvio
86536e64c5
Make sure files are closed 2017-04-04 18:58:20 +01:00
Pedro Algarvio
008f0016e2
Make sure we close the spooled temporary file 2017-04-04 18:58:19 +01:00
Pedro Algarvio
4a43d00d80
Proper mocking 2017-04-04 18:58:19 +01:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration 2017-04-04 18:58:19 +01:00
Pedro Algarvio
104a2fb30c
Keep the same exception raised before the move 2017-04-04 18:04:39 +01:00
Pedro Algarvio
6a638620ba
Move base test case modules to tests.support.case 2017-04-04 18:04:39 +01:00
Pedro Algarvio
9af2ca8823
No need to load all modules docs. 
This should reduce memory usage as well as speeding up the decorator
 2017-04-04 18:04:38 +01:00
Pedro Algarvio
4853952f1f
Use a temporary config 2017-04-04 18:04:38 +01:00
Pedro Algarvio
785698d2ce
Import for the original module 2017-04-04 18:04:38 +01:00
Pedro Algarvio
b94992f544
Some more RUNTIME_CONFIGS and RUNTIME_VARS fixes 2017-04-04 18:04:38 +01:00
Pedro Algarvio
e163a747f1
Minor import fixes 2017-04-04 17:29:34 +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
Nicole Thomas
579794dd64 Remove extra blank line for lint 2017-04-04 10:20:31 -06:00
Mike Place
d254b96498 Merge pull request #40471 from tonybaloney/libcloud_dns_kwargs 
Update to libcloud_dns module to allow custom kwargs for DNS drivers
 2017-04-04 10:12:44 -06:00
Calle Pettersson
c5d33ba065 Salt-vault: Fix handling of None-grains 2017-04-04 16:50:35 +02:00
Eric Radman
3299f5b2ea Add mocks to allow keyboard tests to function on non-Linux systems 2017-04-03 22:11:38 -04:00
Anthony Shaw
8c74d3df89 Update test_libcloud_dns.py 
add absolute imports
 2017-04-04 10:57:32 +10:00
Mike Place
17808e7181 Merge pull request #40480 from terminalmage/docker-auth-handling 
Improved Docker auth handling and other misc. Docker improvements
 2017-04-03 16:44:48 -06:00
Mike Place
55fa3c12fa Merge pull request #39874 from kiorky/fixup_fail_rc 
Make returncode friendly to onfail requisites
 2017-04-03 15:28:50 -06:00
rallytime
ede4c28887 Group checks for failhard setting in () in state.check_failhard function 
Fixes #38683

When two states combine the `require`, `failhard`, and `order` options,
the `order` option should be ignored because `require` is present. Then
the `failhard` option should make the state run fail.

The check for "failhard" in the `check_failhard` function in the state
compiler was too broad. We want "failhard" to be true AND tag to be in
the `running` dict. Without the parens around the first OR statement,
we were bypassing the AND requirement because failhard was found.

Since the second state's tag was not found in the running dict, the state
run stacktraces on a KeyError.
 2017-04-03 14:41:54 -06:00
Erik Johnson
c526e8c7b0 Improved Docker auth handling and other misc. Docker improvements 
This commit changes how we handle Docker authentication. We no longer
try to auth when pushing/pulling images. This was initially done based
on a misunderstanding of how authentication was handled in docker-py.
docker-py will automagically use the base64-encoded username/password
combination stored in config.json if present, so we don't need to auth
at all for push or pull, docker-py will handle all of that. We just need
to make sure that we get the auth info into the config.json. To do this
I have added a login() function to the execution module, which uses the
Docker CLI to authenticate (with output_loglevel set to "quiet" to
suppress any logging of the credentials). The CLI is used in this
instance because docker-py provides no interface by which to persist a
login in the config.json; it can read from the file, but is not designed
to *write* to it. Rather than trying to write to this file ourselves,
and potentially breaking it when (not *if*) Docker decides to change the
internal format of the JSON data structure, using the CLI is a way of
future-proofing the authentication logic.

Context caching of the docker-py client instance has also been removed.
Context caching was used based on the same incorrect understanding of
how docker-py handles authentication, and sought to avoid repeated login
attempts. As that is no longer a concern, there is no need to cache the
client instance in the context dunder because we don't really gain a
performance benefit from it.

The _image_wrapper() function has been removed, as it no longer serves
any purpose, and the image-specific code in it that was still needed
has been absorbed into the _client_wrapper() helper. The functions which
used the _image_wrapper() helper (like push() and pull()) now use
_client_wrapper().

Additionally, the decorators used to enforce a minimum Docker version
(or Docker API version) have been removed. These are not necessary since
docker-py handles raising exceptions when a given feature is not
supported by the effective API version. The _client_wrapper() helper
function now checks for miscellaneous docker exceptions by catching the
docker.errors.DockerException class, which is the base class for the
custom exceptions raised by docker-py, and by doing so catches exceptions
raised due to API version incompatibility (and more).

The list of functions in the top-level docstring has been removed as it
is very out-of-date, and is somewhat superfluous anyway given that we
have for some time now had a list of the functions on the right side of
the page in the documentation.

Other changes:

- Fixed a bug I introduced when I overhauled the
  docker_container.running state, in which a container with no changes
  to be made, which was not running, would be started by the state even
  when test=True was passed.
- Custom registry image names are now properly identified. The colon in
  the hostname of the custom registry was previously causing incorrect
  identification of the image name and tag, when no explicit tag was
  being passed (e.g. localhost:5000/myimage).
- When configuring credentials, the creds for the Docker Hub can be
  configured under a registry named ``hub``. This keeps the user from
  having to figure out the registry URL and configure it in their Pillar
  data, and thus makes using this module easier.
- Removes the email address from the documentation for credential
  configuration. This was probably initially added because docker-py
  accepts it as an argument, but it is entirely ignored for purposes of
  authentication (even by docker-py) and is thus unnecessary. Relic of
  an earlier time in Docker's history, perhaps?
- Fixed RST references to functions which weren't caught when this
  module was renamed to dockermod.py
- Allow filter arguments in docker.networks to be passed as a
  comma-separated list as well as a Python list, in keeping with general
  usage elsewhere in Salt.
 2017-04-03 13:29:28 -05:00
Erik Johnson
1e2a04cfc5 Backport auth and custom registry fixes from #40480 to 2016.3 branch 2017-04-03 13:20:53 -05: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
863d8d453f
Ignore the unimplemented abstract method 2017-04-01 23:23:50 +01:00
Pedro Algarvio
d198a900a4
Remove unused imports 2017-04-01 19:01:09 +01:00
Pedro Algarvio
d6d3161f80
Use a temporary configuration instead 2017-04-01 19:00:14 +01:00
Pedro Algarvio
9fd126c904
Use a temporary configuration instead 2017-04-01 18:58:03 +01:00
Pedro Algarvio
c6fce40a2a
Use a temporary configuration instead 2017-04-01 18:57:25 +01:00
Pedro Algarvio
e2a5b1bf54
Use a temporary configuration instead 2017-04-01 18:56:46 +01:00
Pedro Algarvio
ec7182a292
Use a temporary configuration instead 2017-04-01 18:55:48 +01:00
Pedro Algarvio
f5c36f0048
Integration tests should not use the temporary config 2017-04-01 18:33:28 +01:00
Pedro Algarvio
f66eaa45bf
Use a temporary configuration 2017-04-01 14:30:27 +01:00
Pedro Algarvio
8056479853
This argument is not required when used as a ctx manager 2017-04-01 14:26:11 +01:00
Pedro Algarvio
2ebd04e7ce
Use a temporary configuration 2017-04-01 14:26:11 +01:00
Pedro Algarvio
26e60e825c
Allow creating a temporary configuration to be used for a single test 2017-04-01 14:25:55 +01:00
Pedro Algarvio
4f068f5217
Misplaced test. Use tests.support.unit instead. 2017-04-01 14:23:00 +01:00
Pedro Algarvio
f8d7530a58
Proper mocking. 2017-04-01 14:22:59 +01:00
Pedro Algarvio
a15aa32404
Proper mocking. 2017-04-01 14:22:59 +01:00
Pedro Algarvio
a0245b049f
Proper mocking. 2017-04-01 14:22:59 +01:00
Pedro Algarvio
174625618a
Add mixin to assert XML equality 2017-04-01 14:22:58 +01:00
Pedro Algarvio
22b15a134e
Proper mocking. 2017-04-01 14:22:58 +01:00
Pedro Algarvio
06bc81dc3d
Proper mocking. 2017-04-01 14:22:58 +01:00
Pedro Algarvio
3a5ec6bb0a
Minor lint fix 2017-04-01 14:22:58 +01:00
Pedro Algarvio
9a11538b54
Stop using deprecated TestCase methods 2017-04-01 14:22:57 +01:00
Pedro Algarvio
9cf1b37b54
Take care of some more deprecated TestCase methods 2017-04-01 14:22:57 +01:00
Pedro Algarvio
fbd858c455
Lint 2017-04-01 14:22:57 +01:00
Pedro Algarvio
c28f896adb
Py3 compat 2017-04-01 14:22:57 +01:00
Pedro Algarvio
fd6d031804
We now sync all on minion connect 2017-04-01 14:22:56 +01:00
Pedro Algarvio
c42b6ff4b5
This just feels wrong 2017-04-01 14:22:56 +01:00
Pedro Algarvio
82eea9057a
Proper mocking 2017-04-01 14:22:56 +01:00
Pedro Algarvio
5950c1dd53
Minor logic fix 2017-04-01 14:22:55 +01:00
Pedro Algarvio
d86dbf466a
Use tests.support.unit instead 2017-04-01 14:22:55 +01:00
Pedro Algarvio
104f7a71f2
Why do need the system grains here?! This is an expensive call. 2017-04-01 14:22:55 +01:00
Pedro Algarvio
f82fa73fd7
Pylint disable 2017-04-01 14:22:55 +01:00
Pedro Algarvio
83db7547e7
Proper mocking. 2017-04-01 14:22:55 +01:00
Pedro Algarvio
9dbdee68ba
Move tests to the right test module 2017-04-01 14:22:54 +01:00
Pedro Algarvio
4ef895e064
Add file to ignored paths 2017-04-01 14:22:54 +01:00
Pedro Algarvio
e72ab757a9
Use random ports. Tests cleanup. 2017-04-01 14:22:54 +01:00
Pedro Algarvio
f991143fa7
Don't run these tests under Py3. The PSF takes care of that. 2017-04-01 14:22:54 +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
94c7df78ed
Skip tests on required missing libs 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
Pedro Algarvio
a0ecc4ff00
Fix pytest loading if a system wide salt package is installed 2017-04-01 14:22:52 +01:00
Pedro Algarvio
da7192014e
Py3 compat 2017-04-01 14:22:52 +01:00
Pedro Algarvio
655e8fde1a
Transplant configurations right after CLI parsing is complete 2017-04-01 14:22:52 +01:00
Pedro Algarvio
a013f792c6
We actually need to fix the pip state to recognize new/deprecated options 2017-04-01 14:22:52 +01:00
Pedro Algarvio
22c753afba
Disable pip wheel usage for this test. 
The pip cache dir will be owned by root and not the user created.
Revisit this issue ASAP.
 2017-04-01 14:22:52 +01:00
Pedro Algarvio
0bf7684b8c
Make the option properties available in the config mixin instead 2017-04-01 14:22:51 +01:00
Pedro Algarvio
d05028e88c
These are not integration tests 2017-04-01 14:22:51 +01:00
Anthony Shaw
7ae7b2574a
add utf8 header 2017-04-01 14:05:28 +11:00
Anthony Shaw
9db623ada2
py3 update and lint fixes 2017-04-01 10:14:29 +11:00
Anthony Shaw
c2681db9a4
commit fix and double check in integration test 2017-04-01 09:25:01 +11:00
Anthony Shaw
eb8ab0d75a
add tests to show broken functionlity reported in bug report 2017-04-01 09:21:25 +11:00
rallytime
8f084f7056 Update unit test to look for actual string comment 2017-03-31 15:34:24 -06:00
Joseph Hall
e24f89366a Use a slightly more specific bank name 2017-03-31 15:21:26 -06:00
Joseph Hall
3e84d1476a Add cache.store to the runners 2017-03-31 15:16:36 -06:00
Mike Place
f589e3c4b6 Merge pull request #40457 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-31 14:43:50 -06:00
Mike Place
fdb0250c95 Merge pull request #40429 from DSRCorporation/features/39275_memcache 
MemCache - a minion data cache booster.
 2017-03-31 14:20:59 -06:00
Mike Place
d0ed032364 Merge pull request #40441 from Ch3LL/add_vmware_cloud_tests 
Add vmware cloud tests
 2017-03-31 14:06:25 -06:00
rallytime
55405bcd30 Renamed unit.modules.tuned_test.py to test_tuned.py and updated salttesting imports 2017-03-31 12:23:46 -06:00
Dmitry Kuzmenko
4475d1757d In-memory minion data cache. 2017-03-31 19:38:04 +03:00
rallytime
2d73fca4d0 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/win_dsc.py
  - salt/modules/win_psget.py
  - tests/unit/utils/vmware_test/test_cluster.py
  - tests/unit/utils/vmware_test/test_common.py
  - tests/unit/utils/vmware_test/test_connection.py
  - tests/unit/utils/vmware_test/test_datacenter.py
  - tests/unit/utils/vmware_test/test_host.py
 2017-03-31 10:09:56 -06: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
Ch3LL
89d1f3943d remove unnecessary try blocks 2017-03-31 09:46:34 -06:00
Nicole Thomas
3d6d6de190 Merge pull request #40405 from twangboy/fix_win_file 
Add missing import to win_file, remove missing tests from whitelist
 2017-03-31 09:31:57 -06:00
Bo Maryniuk
9f9dc6e4e7 Add unit test case for fileclient 2017-03-31 13:40:36 +02:00
rajvidhimar
8d83d482c5 Correct the junos unit tests which mock getattr 2017-03-31 16:19:21 +05:30