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
81,863 Commits 24 Branches 182 Tags 341 MiB
40eef0c0e3
Commit Graph

5786 Commits

Author SHA1 Message Date
Jeremy McDermond
40eef0c0e3 JunOS: Fix whitespace for PEP compliance 2017-05-16 08:21:16 -07: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
e1bd7ce10a Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-11 13:03:59 -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
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
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
rallytime
9014033726 Use LoaderModuleMockMixin for setting up default grains/salt dunders 2017-05-10 13:49:43 -06:00
rallytime
c282533612 Use with patch.dict for timezone.__grains__ dictionaries 2017-05-10 10:32:24 -06: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
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
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
Erik Johnson
2af89beb53 Merge pull request #41103 from lorengordon/win.get_route 
Adds a get_route() function to win_network.py
 2017-05-06 01:19:41 -05:00
Loren Gordon
93ce5644ea Adds test for win_network.get_route 2017-05-05 17:32:50 -04:00
rallytime
6e857681d4 Add calls to salt.client.get_local_client to patches list in auth unit tests 
We need to mock the calls to `salt.client.get_local_client` in the
tests.unit.test_auth.py file. Without these mocks, there are many tests
that fail when the entire set of unit tests runs. (Specifically, these fail
with both the module and state boto_apigateway unit tests run.)

This mocked patch is similar to the change in PR #41082 and fixes all 16 test
failures reported in https://github.com/saltstack/salt-jenkins/issues/326.
 2017-05-05 14:26:54 -06:00
Nicole Thomas
272b063963 Merge pull request #41095 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-05 13:03:22 -06:00
lomeroe
2b1290b9e3 update win_dns_client tests with correct module names 2017-05-05 12:09:17 -05:00
Mike Place
5dee0b4804 Merge pull request #37952 from lorengordon/jinja-filter-decorator 
Adds an alternate implementation for a jinja filter decorator
 2017-05-05 11:08:20 -06:00
Mike Place
330e717150 Merge pull request #40977 from amendlik/kernelpkg 
kernelpkg module
 2017-05-05 10:21:12 -06:00
rallytime
01a012bbdf Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-05 10:12:18 -06:00
Adam Mendlik
2bc930acb3 Fix linter errors 2017-05-05 06:27:37 -06:00
Adam Mendlik
9f13ce9ee2 Fix kernelpkg.latest_available when no upgrades are available 2017-05-05 05:51:11 -06:00
Loren Gordon
bff15d4c61 Updates jinja template tests with salt context 2017-05-05 07:21:40 -04:00
Loren Gordon
ae89f14178 Updates tests to get custom filters from decorator class 2017-05-05 07:21:40 -04:00
Adam Mendlik
741fd9d1ee Rename kernelpkg.current to kernelpkg.active for clarity 2017-05-04 19:15:04 -06:00
rallytime
891e174f71 Patch calls to salt.client.Caller and salt.client.get_local_client in spm unit tests 
Fixes the spm unit test failures in CentOS 6. These calls to the client need to be
patched so they don't interact with other unit tests.
 2017-05-04 14:30:49 -06:00
Mike Place
041e385ee4 Merge pull request #41016 from secumod/develop 
Read some hardware grains from sysfs on Linux if available
 2017-05-04 09:46:01 -06:00
rallytime
b93e35dd06 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/engines/docker_events.py
 2017-05-03 10:00:24 -06:00