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
82,764 Commits 24 Branches 182 Tags 341 MiB
17ddc9396c
Commit Graph

10184 Commits

Author SHA1 Message Date
Daniel Wallace
e5f5514ec6 add venafi test 2017-05-25 10:26:54 -06:00
rallytime
ff0def408b Whitespace fix 2017-05-25 10:26:06 -06:00
Erik Johnson
28a8605dea Skip a test that doesn't apply to Python 3 
This test is checking behavior that seems to have been specific to the
carbon package from PyPI. Since this is a Python 2-only module, and has
deps that do not exist on Python 3, it should not be run on Python 3.
 2017-05-25 09:37:35 -05:00
Dmitry Kuzmenko
7a9b4a92af Fixed syslog-ng test: it passes command as list, not as a string. 2017-05-25 14:33:43 +03:00
Dmitry Kuzmenko
6b0921e5ba Py3 tests fixes: don't mock non-callable objects with return_value. 
mock = MagicMock(return_value='') works for functions: here mock() will
return the value (empty string). But mock returns the MagicMock object.
Not sure why but it worked in Py2, but in Py3 os.path.join(mock,
'something'), for instance, returns an error.

Fixed the issues by avoiding of using mocks where we can use simple
strings.
 2017-05-25 12:33:43 +03:00
Dmitry Kuzmenko
67e0c3e166 Terminate gpg-agent after each test. 
This is actual for gnupg 2.1 that requires the agent and starts it
automatically. But since each test creates a new keystore tests become
fail after the first one starts gpg-agent.
 2017-05-25 12:33:43 +03:00
rallytime
9ff2694155 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py
 2017-05-24 16:32:59 -06:00
rallytime
57166fd892 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-24 15:30:44 -06:00
Nicole Thomas
460af48f1f Merge pull request #41390 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-24 15:27:22 -06:00
rallytime
537fd763dc Rename proxy test files to use test_* syntax 2017-05-24 13:03:21 -06:00
Nicole Thomas
a924806d6e Merge pull request #41411 from rallytime/fix-haproxyconn-tests 
Fix haproxyconn unit test failures
 2017-05-24 13:01:29 -06:00
Mike Place
88fd3c0ed9 Merge pull request #41336 from mcalmer/fix-locale-on-SUSE 
fix setting and getting locale on SUSE systems
 2017-05-24 12:46:07 -05:00
Mike Place
4678b5cb84 Merge pull request #41386 from grahamhayes/unit-tests-40905 
Add unit test for PR #40905
 2017-05-24 12:02:13 -05:00
Mike Place
49f93cb091 Merge pull request #41405 from isbm/isbm-zypper-wildcards-dev 
Wildcards for Zypper
 2017-05-24 11:57:42 -05:00
rallytime
68c277e5f7 Fix haproxyconn unit test failures 
Too many arguments were being passed into the test function

This change removes the extra "mock" arg and the tests pass.

This issue was introduced in PR #40713

Fixes https://github.com/saltstack/salt-jenkins/issues/357
 2017-05-24 10:41:38 -06:00
Mike Place
d578aa9f68 Merge pull request #41332 from bodhi-space/infra4842 
INFRA-4842 - boto_elb should return None when test=True and changes are pending
 2017-05-24 11:24:47 -05:00
rallytime
098ed60d1b Rework proxy minion test files to use new import styles 2017-05-24 10:23:57 -06:00
rallytime
5b27c2daf8 Comment out/remove proxy pieces from integration tests file 
This was left over from a merge-forward. The proxy minion testing
pieces could not be completely merged-forward due to large conflicts
in this file. Please see the comment in PR #41113 for more information.
 2017-05-24 09:51:00 -06:00
Bo Maryniuk
22732504a3 Add UT for unsupported operators 2017-05-24 16:29:59 +02:00
Bo Maryniuk
a579ffc166 Lintfixes 2017-05-24 15:19:39 +02:00
Bo Maryniuk
3d40688cd9 Add UT for operator conditions 2017-05-24 13:55:49 +02:00
Bo Maryniuk
0bf0950158 Add UT for typecheck on the output data 2017-05-24 13:55:49 +02:00
Bo Maryniuk
20ff494b93 Add UT for None type verification if version has been not passed 2017-05-24 13:55:49 +02:00
Bo Maryniuk
c806128d51 Add UT for wildcard finder usage 2017-05-24 13:55:49 +02:00
Bo Maryniuk
552b3265d0 Test the exact methods for matcher 2017-05-24 13:55:49 +02:00
Bo Maryniuk
561ae0b8c8 Add UT for exact match of the pattern at the beginning 2017-05-24 13:55:49 +02:00
Bo Maryniuk
b1ddcccda0 Add UT for exact match of the pattern at the end 2017-05-24 13:55:49 +02:00
Bo Maryniuk
4c9dd39118 Add UT to match multiple asterisks 2017-05-24 13:55:49 +02:00
Bo Maryniuk
8839f7219b Add UT for matching all versions 2017-05-24 13:55:49 +02:00
Bo Maryniuk
5988e3b5d3 Fix a docstring 2017-05-24 13:55:49 +02:00
Bo Maryniuk
508c439b2b Rename UT to a proper name 2017-05-24 13:55:49 +02:00
Bo Maryniuk
3b44018f58 Add unit test scaffold for wildcard support 2017-05-24 13:55:49 +02:00
Benjamin Drung
33a7f8b2ec Fix typos 
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-24 12:50:29 +02:00
rallytime
d2d9a3d29f Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/cli/salt-cp.rst
  - salt/config/__init__.py
 2017-05-23 15:58:14 -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
Tom Williams
3eebfb7e73 INFRA-4842 - /thought/ I fixed this :) 2017-05-23 12:04:19 -04:00
Graham Hayes
44b7ecf45f
Add unit test for PR #40905 
This ensures we do not introduce a regression which breaks
the usage of the `batch` option when using states in orchestration
runners.

Related to #40635 and #39169
 2017-05-23 16:23:17 +01: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
Dmitry Kuzmenko
3cd0f5ebcf Check master shut down correctly. 2017-05-23 11:53:56 +03:00
Dmitry Kuzmenko
4ed0f8ed4e Fixed grains module test: Arch release is 'rolling', not an empty str. 2017-05-23 11:53:56 +03:00
Dmitry Kuzmenko
583e3b9a5a Update pip version in pip upgrade test by compatibility reason. 
6.0 version doesn't work in a modern environment.
 2017-05-23 11:53:56 +03:00
Dmitry Kuzmenko
d80fa95f10 Add venv version of test_pip_installed_removed to work as non-root. 2017-05-23 11:53:56 +03:00
Dmitry Kuzmenko
9f31428129 Update ACL module test to work as non-root. 2017-05-23 11:53:56 +03:00
Tom Williams
7d519a4533 INFRA-4842 - fixup unit tests to suit 2017-05-22 23:26:03 -04:00
Mike Place
b43b89c5fa Merge pull request #40713 from pgstenberg/feature-haproxyconnaddfunc 
Additional functionality to the haproxy module
 2017-05-22 12:11:32 -05: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
C. R. Oldham
6db31ce52a Fix problem with sysrc on FreeBSD, YAML overeager to coerce to bool and int. 
Fix problem with sysrc on FreeBSD, YAML overeager to coerce to bool
 2017-05-20 19:39:22 -06:00
rallytime
2ba9f644f6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-20 17:08:39 -06: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
Mike Place
d617c9fe72 Merge pull request #41265 from terminalmage/issue41234 
yumpkg: fix latest_version() when showdupesfromrepos=1 set in /etc/yum.conf
 2017-05-19 13:49:58 -05:00
Mike Place
ebd8376ef4 Merge pull request #41328 from jpautler/dev/jpautler/hwclock_nilinuxrt_support 
Update timezone get/set_hwclock for NILinuxRT systems
 2017-05-19 13:04:21 -05:00
Michael Calmer
f30f5c8a25 fix unit tests 2017-05-19 13:28:52 +02:00
Tom Williams
dcadf12d4d INFRA-4842 - update unit test to account for new test=True result 2017-05-18 18:04:01 -04:00
Erik Johnson
edf552fe9a Update PKG_TARGETS for RHEL-based distros 2017-05-18 11:15:06 -05:00
Mike Place
9f359d841f Merge pull request #41208 from pkazmierczak/pkazmierczak-zypper-multiple-ver-pkgs 
Fix: zypper handling of multiple version packages
 2017-05-18 10:44:26 -05:00
Jeffrey Pautler
6254b8f326 Update set_hwclock to only accept UTC on NILinuxRT 
NILinuxRT systems do not support non-UTC timezones for hwclock, so
enforce that in set_hwclock.
 2017-05-17 16:44:44 -05:00
Erik Johnson
acc5f14bae Don't overwrite environment in pip tests 
Potentially fixes https://github.com/saltstack/salt-jenkins/issues/340
 2017-05-17 15:12:35 -05:00
Mike Place
4ed45d9dcc Merge pull request #41281 from alexbleotu/root_dir_prepend_fix-gh 
Root dir prepend fix gh #2
 2017-05-17 14:10:26 -05:00
Mike Place
9d9bf1c7f6 Merge pull request #41247 from mcdermj/develop 
JunOS: Change os_install to use get_file instead of get_template
 2017-05-17 13:46:15 -05:00
Mike Place
1c1e092f56 Merge pull request #41269 from isbm/isbm-minion-id-127-name 
Bugfix: Unable to use "127" as hostname for the Minion ID
 2017-05-17 13:31:15 -05:00
Mike Place
c51a6e4757 Merge pull request #41270 from isbm/isbm-minion-id-127-name-devel 
Bugfix: Unable to use "127" as hostname for the Minion ID (devel)
 2017-05-17 13:29:03 -05:00
Mike Place
fe38c7cf5e Merge pull request #41282 from mcdermj/bp-41247 
JunOS: Change os_install to use get_file instead of get_template
 2017-05-17 13:25:26 -05:00
Mike Place
1d89454fd8 Merge pull request #41285 from kraney/boto_lambda_vpc_reset 
fix a bug in boto_lambda state where if VpcConfig is None or absent, …
 2017-05-17 11:55:58 -05:00
Alexandru Bleotu
513254678f Fixed tests in test_api to not have a side-effect of changing the salt.config.DEFAULT_API_OPTS array 2017-05-17 17:21:15 +01:00
Alexandru Bleotu
4737b0d4fd Added test to prevent errors when the config root path includes the default root path 2017-05-17 17:21:15 +01:00
Nicole Thomas
c2377cd2d0 Merge pull request #41293 from terminalmage/py3-tests 
Python 3 test fixes + better pip/virtualenv detection.
 2017-05-17 09:13:06 -06:00
Piotr Kaźmierczak
d411a91676 Reverted back to cascading with statements for python 2.6 compat 2017-05-17 11:52:56 +02:00
Bo Maryniuk
5f01e748e0 Fix Lint 2017-05-17 08:42:38 +02:00
rallytime
9668480fc5 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-16 19:58:21 -06:00
Winston Liu
a96e431717 fixed unit test failures. 2017-05-16 15:09:00 -07:00
rallytime
76714d116b Mock calls to salt.utils.pkg.clear_rtag call in aptpkg unit tests 2017-05-16 16:00:37 -06:00
rallytime
8e1db7c427 Pylint fix 2017-05-16 15:53:11 -06:00
Piotr Kaźmierczak
7204013653 Compacted with statements in the unit test. 2017-05-16 22:48:09 +02:00
Erik Johnson
b7cc420e6f decode to string before trying to load JSON 2017-05-16 14:20:05 -05:00
Piotr Kaźmierczak
6c4c08042c Added unit tests and copied the behavior to 
.upgrade method, too.
 2017-05-16 20:47:04 +02:00
Jeremy McDermond
3e481cb764 JunOS: Fix whitespace for PEP compliance 2017-05-16 10:00:58 -07:00
Jeremy McDermond
f1751d135a JunOS: Fix Unit Test 
When adding the cp.get_file function, we need to add it into the list of
mock functions in the unit test along with get_template or the unit
tests will fail.
 2017-05-16 10:00:50 -07:00
Jeremy McDermond
40eef0c0e3 JunOS: Fix whitespace for PEP compliance 2017-05-16 08:21:16 -07: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
Jeremy McDermond
7cdf7b3546 JunOS: Fix Unit Test 
When adding the cp.get_file function, we need to add it into the list of
mock functions in the unit test along with get_template or the unit
tests will fail.
 2017-05-15 16:12:19 -07:00
rallytime
d23010a114 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/states/libcloud_dns.py
  - salt/states/pkg.py
  - tests/integration/modules/test_pkg.py
  - tests/unit/modules/test_mac_brew.py
  - tests/unit/modules/test_pkgutil.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/states/libcloud_dns_test.py
 2017-05-15 16:41:59 -06:00
rallytime
bde9d6cdc0 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-15 16:29:13 -06:00
Nicole Thomas
9290435745 Merge pull request #41223 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-15 16:13:33 -06:00
Nicole Thomas
cbe6d00513 Merge pull request #41204 from twangboy/fix_pub_win 
Increase timeout for Windows
 2017-05-15 14:04:33 -06:00
rallytime
8ee4bbb8eb Add "conf_file" to ADDITIONAL_OPTS for pillar integration tests 2017-05-15 13:52:07 -06:00
Nicole Thomas
75942235f0 Merge pull request #41220 from rallytime/bp-40246 
Back-port #40246 to 2016.11
 2017-05-15 11:59:38 -06:00
Mike Place
5a8cec17c2 Merge pull request #41207 from amendlik/kernelpkg 
kernelpkg updates
 2017-05-15 11:56:56 -05:00
Mike Place
50d8fde123 Merge pull request #41101 from terminalmage/issue40940 
Fix "latest" keyword for version specification when used with aggregation
 2017-05-15 11:52:35 -05:00
Dmitry Kuzmenko
b10730d8a1 Py3: Fixed timezone test. 2017-05-15 19:40:57 +03:00
Erik Johnson
0e15fdbb1a Update salt-cp integration test to reflect recent changes 2017-05-14 14:20:27 -05:00
rallytime
d75a7e0d0f Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-12 16:42:54 -06:00
Anthony Shaw
2f610680e5 remove unused imports 2017-05-12 16:38:30 -06:00
Anthony Shaw
9b7de2e7d7 fix unit tests 2017-05-12 16:37:26 -06:00
Anthony Shaw
49d94559ab linting 2017-05-12 16:36:07 -06:00
Anthony Shaw
4b260a4594 linting 2017-05-12 16:36:07 -06:00
Anthony Shaw
41d1adab5f fix up tests 2017-05-12 16:36:06 -06:00
Erik Johnson
7fe64219ae Add rtag check to integration test for pkg.refresh_db 2017-05-12 15:21:22 -05:00
C. R. Oldham
19db038b99 Fix test--use proxy_config instead of minion_config 2017-05-12 14:01:54 -06:00
twangboy
e9df95d2a0 Add timout in tests instead of publish 2017-05-12 11:32:04 -06:00
Mike Place
a0a2646007 Merge pull request #41194 from rallytime/md5-warning-cleanup 
Update fingerprint hash type default from md5 to sha256
 2017-05-12 11:13:18 -05:00
Adam Mendlik
bec23de76f Add function kernelpkg.upgrade_available to kernelpkg module 
This function return a True/False value if a newer kernel
is available in the package repositories.
 2017-05-11 18:09:14 -06:00
rallytime
e1bd7ce10a Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-11 13:03:59 -06:00
rallytime
8dfa8d1d19 Pass the fingerprint_hash_type through for gitfs sshd tests 2017-05-11 12:29:51 -06:00
Nicole Thomas
88eabbb57d Merge pull request #41179 from rallytime/fix-jinja-template-test 
Split up test asserts in jinja template unit test
 2017-05-11 10:23:16 -06:00
rallytime
bb0f8f32de Update fingerprint hash type default from md5 to sha256 
This PR also removes the warnings that this default with change in
the Nitrogen release, updates the documetation accordingly, and adjusts
some of the affected tests.
 2017-05-11 09:33:45 -06:00
rallytime
d4e42b8e74 Use cptc.BaseRestCherryPyTest as test class 2017-05-11 09:09:40 -06:00
rallytime
738681c20f Pylint fix 2017-05-11 09:03:10 -06:00
rallytime
6729587d54 Spelling fix 2017-05-10 16:59:39 -06:00
rallytime
3a5419ba3f Split up test asserts in jinja template unit test 
Due to a bug in the equality handler, this test was failing on
CentOS 6 running Python 2.7.13. This PR splits up the test assertions
into several different pieces in order to cover all the possible
use cases, but also pass on CentOS 6.
 2017-05-10 16:55:37 -06:00
rallytime
4100e2b6a6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-10 15:32:33 -06:00
rallytime
12a75c1108 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-10 15:32:23 -06:00
Nicole Thomas
496fa3accd Merge pull request #41156 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-10 15:29:54 -06:00
Nicole Thomas
b136b15330 Merge pull request #41104 from Ch3LL/add_jobs_test 
Add test to query results of /jobs call in api
 2017-05-10 14:11:07 -06:00
Nicole Thomas
ac5bda8839 Merge pull request #41117 from terminalmage/rename_env_blacklist_whitelist 
Rename the *_env_blacklist config opts to *_saltenv_blacklist
 2017-05-10 14:03:23 -06:00
Erik Johnson
77ae15e41b Merge pull request #41155 from rallytime/git-test-fixes 
Gate and skip git state integration tests when git version is older
 2017-05-10 14:53:12 -05:00
rallytime
9014033726 Use LoaderModuleMockMixin for setting up default grains/salt dunders 2017-05-10 13:49:43 -06:00
Nicole Thomas
e7b714b6e1 Merge pull request #41171 from terminalmage/remove-git_pillar_warning 
Remove git_pillar warning from integration suite startup
 2017-05-10 11:36:54 -06:00
rallytime
23ee513397 Pylint: Add extra line above function declaration 2017-05-10 11:32:41 -06:00
Ch3LL
dac16583b7
add test to query results of /jobs call in api 2017-05-10 12:39:17 -04:00
rallytime
c282533612 Use with patch.dict for timezone.__grains__ dictionaries 2017-05-10 10:32:24 -06:00
Erik Johnson
03b5420988 Remove git_pillar warning from integration suite startup 
This is no longer needed since the git_pillar configuration has been
removed from the suite's master config file now that git_pillar
integration tests have been added.
 2017-05-10 11:13:43 -05:00
Erik Johnson
018ec5fff9 Make git version checks into decorators 
Also fix a bug in one test where edits to a file are made in the current
working directory and not the git repo being used for the test.
 2017-05-10 10:40:12 -05:00
lomeroe
2af89f2165 update mock data 2017-05-10 10:33:34 -05:00
lomeroe
b7fa115a59 update win_dns_client tests with correct module names 2017-05-10 10:33:33 -05:00
rallytime
baa8e3f5a6 Move new timezone_test.py tests over to test_timezone.py tests 2017-05-09 16:33:18 -06:00
twangboy
bc827ad8a7 Fix unit test 2017-05-09 16:00:24 -06:00
rallytime
ef0df4a954 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_network.py
  - salt/modules/win_pkg.py
  - salt/utils/gitfs.py
  - tests/unit/modules/test_win_network.py
  - tests/unit/states/test_file.py
 2017-05-09 14:32:49 -06:00
Nicole Thomas
3e91fc1896 Merge pull request #41150 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-09 14:05:29 -06:00
rallytime
317b5e39bd Add git_opts flag to _check_git_version helper funciton 
We only need to skip the tests with git versions < 1.7.2 when
the test uses the git_opts option.
 2017-05-09 13:52:47 -06:00
rallytime
4019db15fb Skip git state tests when using the "git_opts" option 
And also add some gates for if the git version is too low in general.

This fixes the test failures on CentOS 6 currently in the nitrogen branch.
 2017-05-09 13:46:24 -06:00
Mike Place
bef2252720 Merge pull request #41136 from lorengordon/shadow.list_users 
Adds a function to list all users from shadow file
 2017-05-09 12:38:25 -06:00
Mike Place
a2f359fa13 Merge pull request #40852 from isbm/isbm-fix-coregrains-constants-bsc#1032931 
Isbm fix coregrains constants bsc#1032931
 2017-05-09 12:35:45 -06:00
Mike Place
8099c9f27f Merge pull request #41081 from lomeroe/fix-win_dns_client-reg_read 
Update win_dns_client to use reg.read_value and set_value
 2017-05-09 12:13:51 -06:00
rallytime
4c099df8fa Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-09 11:27:55 -06:00
Loren Gordon
06c46b48f3 Adds a function to list all users from shadow file 2017-05-09 12:58:12 -04:00
Nicole Thomas
f8bfd36519 Merge pull request #41112 from rallytime/suse-pkg-test 
Make sure "version" exists before looking for pkg key
 2017-05-09 10:00:52 -06:00
Nicole Thomas
1a1c80f67c Merge pull request #41109 from rallytime/fix-auth-unit-tests 
Add calls to salt.client.get_local_client to patches list in auth unit tests
 2017-05-09 10:00:08 -06:00
Bo Maryniuk
f3b12a3f5b Do not use multiple variables in "with" statement as of lint issues 2017-05-09 10:17:49 +02:00
Erik Johnson
67363f6e32 Update fileserver unit tests 
This fixes the tests by adding back gitfs_env_blacklist, and also
converts the config tests to use the new LoaderModuleMixin.
 2017-05-08 20:30:46 -05:00
lomeroe
3375fc0244 update mock data 2017-05-08 12:05:56 -05:00
Theophile Meneau
d8766562c9 fix incorrect service.running success response 
when enable=None and init script returns 0,
but service failed to start.

Fixes #41125
 2017-05-08 10:25:21 -04:00
Bo Maryniuk
35a8d99934 Disable the test for a while 2017-05-08 13:49:54 +02:00
Bo Maryniuk
76cb1b7150 Rewrite test case for using no patch decorators 2017-05-08 10:41:50 +02:00
Erik Johnson
59737a34a5 Rename the *_env_blacklist config opts to *_saltenv_blacklist 
These were overlooked a while back when we deprecated env in favor of
saltenv.
 2017-05-06 23:11:33 -05:00
Erik Johnson
dcb0d63883 Update test to reflect additional calls to os.path.isfile() 2017-05-06 01:51:11 -05:00
Erik Johnson
ffe4bc3d5c update unit test to reflect new behavior 2017-05-06 01:29:49 -05:00
Erik Johnson
772167306c Merge pull request #41015 from gtmanfred/docker 
Allow docker.call to run as non-root user
 2017-05-06 01:21:05 -05:00