Bo Maryniuk
155a498b49
Doc fix
2017-04-24 16:08:22 +02:00
Bo Maryniuk
a40876cdac
Remove unnecessary mock patch
2017-04-24 16:08:22 +02:00
Bo Maryniuk
ffab2db213
Fix doc for RH UT
2017-04-24 16:08:22 +02:00
Bo Maryniuk
72388f7ae2
Add UT for RedHat's set_zone
2017-04-24 16:08:22 +02:00
Bo Maryniuk
11595d3a42
Refactor with setup/teardown
2017-04-24 16:08:22 +02:00
Bo Maryniuk
28072c9e41
Adjust the test so it is using the right grain for SUSE systems
2017-04-24 16:08:22 +02:00
Bo Maryniuk
7a0e4be4f8
Add unit test for get_zone and various platforms
2017-04-24 16:08:22 +02:00
Bo Maryniuk
116c96a4b7
Fix UT parameter changes
2017-04-22 10:08:20 +02:00
Bo Maryniuk
ed84420df0
Add unit test for node ip filtering
2017-04-22 10:08:20 +02:00
Bo Maryniuk
82582cff77
Skip test, if libcloud is not around
2017-04-22 10:08:20 +02:00
Bo Maryniuk
f005d53c56
Fix name error exception
2017-04-22 10:08:20 +02:00
Bo Maryniuk
5e574a24d9
Add unit test for nova connector
2017-04-22 10:08:19 +02:00
Bo Maryniuk
cd43805770
Add initial unit test for openstack cloud module
2017-04-22 10:08:19 +02:00
Bo Maryniuk
177f31446d
Add fake preferred IP function for testing
2017-04-22 10:08:19 +02:00
Mike Place
2ab95b7dd5
Set minion test to use default opts
2017-04-18 08:34:57 -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
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
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
Daniel Wallace
a61fc824c4
use loader for war extraction
...
Also set the version added in the docs
2017-04-13 11:51:22 -06:00
Ch3LL
60724980ec
fix test_fstype test for mac
2017-04-13 12:04:20 -04: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
Daniel Wallace
b0bd99c26d
add comment and unit test
2017-04-11 21:08:06 -06:00
Erik Johnson
5ea1f607b0
Fix mocking in unit tests
2017-04-10 13:57:39 -05:00
rallytime
5a419b8aae
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/pillar.py
2017-04-07 11:23:41 -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
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
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
Erik Johnson
a6d68f50fe
Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11
2017-04-06 10:15:47 -05: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
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
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
1e2a04cfc5
Backport auth and custom registry fixes from #40480 to 2016.3 branch
2017-04-03 13:20:53 -05:00
rallytime
8f084f7056
Update unit test to look for actual string comment
2017-03-31 15:34:24 -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
Dmitry Kuzmenko
4475d1757d
In-memory minion data cache.
2017-03-31 19:38:04 +03: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
Bo Maryniuk
9f9dc6e4e7
Add unit test case for fileclient
2017-03-31 13:40:36 +02:00
Mike Place
c26f4cc76c
Merge pull request #40371 from terminalmage/pr-40344
...
Fix path handling for masterless gitfs on Windows
2017-03-30 16:36:20 -06:00
Mike Place
132d8b7b88
Merge pull request #40376 from nmadhok/2016.11
...
Backporting changes in vmware cloud driver from develop branch to 2016.11 branch
2017-03-30 16:35:12 -06:00
Dheeraj
77a40a0c44
Lint fixes
2017-03-30 10:31:16 +05:30
Dheeraj
8c1adfafd5
More complete fix for 39692
...
The existing fix did not work if the profile name itself had a dash `-`.
For example - `virtual-guest`. This commit fixes that by using `split('- ')`
rather than `split('-')`. This commit also provides two simple tests for the
`list_()` function to emulate behaviour of both old and new tuned-adm versions
Fixes #39692
2017-03-30 10:31:16 +05:30
