valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,656 Commits 24 Branches 182 Tags 341 MiB
6b45debf28
Commit Graph

8930 Commits

Author SHA1 Message Date
Nicole Thomas
6b45debf28 Merge pull request #41988 from redmatter/fix-dockerng-network-matching 
Fix dockerng.network_* name matching
 2017-07-27 15:25:06 -06:00
Mike Place
641a9d7efd Merge pull request #41968 from root360-AndreasUlm/fix-rabbitmqctl-output-handler 
Fix rabbitmqctl output sanitizer for version 3.6.10
 2017-07-25 14:12:36 -05:00
Mike Place
0a72e56f6b Merge pull request #42356 from meaksh/2016.11-AliasesLoader-wrapper-fix 
Allow to check whether a function is available on the AliasesLoader wrapper
 2017-07-19 11:56:41 -05:00
Pablo Suárez Hernández
915d94219e Allow to check whether a function is available on the AliasesLoader wrapper 2017-07-18 12:57:36 +01:00
Erik Johnson
14cf6ce322 is_windows is a function, not a propery/attribute 
While not fatal, this could potentially cause problems running this
test on Windows.
 2017-07-17 23:36:21 -05:00
Gareth J. Greenaway
a34970b45b Back porting the fix for 2017.7 that ensures the order of the names parameter. 2017-07-06 12:12:50 -07:00
Erik Johnson
9a268949e3 Add integration test for 42116 2017-07-05 00:48:50 -05:00
Andrew Bulford
9eea796da8 Add regression tests for #41982 
These test the scenarios where another network with a similar name
already exists, verifying that network_absent doesn't attempt to remove
a network which isn't specified, and network_present still attempts to
create the specified network despite a similarly named network already
being present.
 2017-06-30 11:03:45 +01:00
Andrew Bulford
3369f0072f Fix broken unit test test_network_absent 
This started failing following commit 515c612, which relied on the
'Name' key being present in the return value of dockerng.networks -
as the mock didn't have this set the test started failing.
 2017-06-30 11:01:10 +01: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
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
Andreas Ulm
76fd941d91 added tests for rabbitmq 3.6.10 output handler 
Signed-off-by: Andreas Ulm <andreas.ulm@root360.de>
 2017-06-28 01:13:30 +02:00
Mike Place
e28e10ded2 Merge pull request #41914 from vutny/fix-archive-extracted-local-file-hash 
archive.extracted: fix hash sum verification for local archives
 2017-06-26 12:59:27 -05:00
Denys Havrysh
54910fe55f archive.extracted: fix hash sum verification for local archives 2017-06-26 19:08:47 +03:00
Mike Place
ff67d47a2e Merge pull request #41516 from kstreee/fix-blocking-waiting-tcp-connection 
Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications.
 2017-06-26 09:41:38 -05:00
kstreee
df96969959 Removes redundant closing statements. 2017-06-26 04:58:24 +00:00
garethgreenaway
4a326444fe Merge pull request #41882 from Ch3LL/fix_crypt_test 
Add pycryptodome to crypt_test
 2017-06-21 12:51:09 -07:00
Ch3LL
6f70dbd0e1 Add pycryptodome to crypt_test 2017-06-21 13:41:12 -04:00
Mike Place
13df29ed9b Merge pull request #41877 from Ch3LL/fix_netstat_test 
Fix netstat and routes test
 2017-06-21 11:16:58 -05:00
Mike Place
66f8c83c93 Merge pull request #41566 from morganwillcock/certutil 
win_certutil: workaround for reading serial numbers with non-English languages
 2017-06-21 10:40:28 -05:00
Mike Place
4d0f5c433d Merge pull request #41679 from terminalmage/get-top-file-envs 
Prevent unnecessary duplicate pillar compilation
 2017-06-21 10:32:42 -05:00
Ch3LL
d2076a6c93 Patch salt.utils.which for test_route test 2017-06-21 10:55:01 -04:00
Ch3LL
51f7e107dc Patch salt.utils.which for test_netstat test 2017-06-21 10:50:03 -04:00
Erik Johnson
a916e8da49 Improve normalization of saltenv/pillarenv usage for states 2017-06-21 08:49:34 -05:00
Erik Johnson
02f293a19c Update state unit tests to reflect recent changes 2017-06-21 08:19:05 -05:00
Morgan Willcock
c337d52d0c Fix test data for test_get_serial, and a typo 2017-06-21 00:26:47 +01:00
Morgan Willcock
7f6961378e test and lint fixes 2017-06-20 22:30:11 +01:00
Mike Place
58387b127a Merge pull request #41786 from whiteinge/runner-arg-parsing-regressions 
Runner arg parsing regressions
 2017-06-19 18:00:06 -05:00
Seth House
9d1cc1a176 Add test to check that runners ignore invalid kwargs 
I dunno if this is what we want long-term but this tests current
behavior.
 2017-06-15 17:40:38 -06:00
rallytime
b6cc0b6bf0 Manually backport the changes in PR #41615 
The automatic back-porting process did't work for this file since the
testing file has been renamed. I manually added the changes to
`timezone_test.py` that were present in PR #41615.
 2017-06-15 08:53:25 -06:00
Nicole Thomas
2c24012ded Merge pull request #41753 from rallytime/bp-41449 
Back-port #41449 to 2016.11
 2017-06-14 16:16:10 -06:00
Sébastien Wains
fae41c2875 Adjusting SVN unit test 2017-06-14 13:40:50 -06:00
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - conf/master
  - salt/utils/schedule.py
 2017-06-14 13:24:11 -06:00
Erik Johnson
bdaeb55a77 Merge pull request #40902 from lorengordon/pillar-get-merge-lists 
Removes duplicates when merging pillar lists and adds pillar.get override for pillar_merge_lists
 2017-06-14 13:39:08 -05:00
rallytime
1e9a06000b Bump version check down to 1.4.0 and use distutils.version lib 2017-06-14 09:30:22 -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
a30f654b04 Support apache-libcloud work-around for issue #32743 for versions older than 2.0.0 
If apache-libcloud 2.0.0 is installed, the workaround outlined in issue #32743
no longer applies and should be avoided. However, we still need to support older
versions of apache-libcloud that need this work-around.

The minimum version required of apache-libcloud has been updated to 2.0.0 in pull
request #40837, which will released in Oxygen. #40837 has removed all of the
work-arounds needed for issue #32743 for 2.0.0. Until Oxygen is released, however,
we need to support both the work-around for older versions of apache-libcloud as
well as 2.0.0.
 2017-06-13 14:22:32 -06:00
Daniel Wallace
0fa380f75c npm 5 and greater requires --force for cache clean 
This is the error

```
npm ERR! As of npm@5, the npm cache self-heals from corruption issues and
data extracted from the cache is guaranteed to be valid. If you want to make
sure everything is consistent, use 'npm cache verify' instead.

npm ERR!
npm ERR! If you're sure you want to delete the entire cache, rerun this command
with --force.
```
 2017-06-12 14:48:43 -06:00
C. R. Oldham
628f709c3c Correct test--caching requires files on disk but the test just supplies 
what would have been read from disk.
 2017-06-12 12:55:14 -06:00
Mike Place
b720ecb732 Merge pull request #41569 from gtmanfred/fix_test_result_check 
Check all entries in result
 2017-06-06 13:18:16 -05:00
rallytime
535b8e8d8e Update new pyroute2 unit test to conform with 2016.11 branch standards 2017-06-05 20:55:44 -06:00
Daniel Wallace
19ea5481b6 remove test that never passed 2017-06-05 17:45:23 -06:00
Peter V. Saveliev
5c86dee73c unit tests: test_pyroute2 -- add skipIf 
... and comments

Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-05 17:22:48 -06:00
Peter V. Saveliev
026b39493f unit tests: add encoding clause into test_pyroute2 
Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-05 17:22:48 -06:00
Peter V. Saveliev
9ab203d54b unit tests: fix absolute imports in test_pyroute2 
Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-05 17:22:48 -06:00
Peter V. Saveliev
1f507cfa7a unit tests: add pyroute2 interface dict test 
Bug-Url: https://github.com/saltstack/salt/pull/41487
Bug-Url: https://github.com/saltstack/salt/issues/41461
 2017-06-05 17:22:48 -06:00
Nicole Thomas
cc6c98a8d8 Merge pull request #41509 from seanjnkns/fix-keystone-v3-endpoint_present 
Add keystone V3 API support for keystone.endpoint_present|absent
 2017-06-02 21:01:05 -06:00
Daniel Wallace
e2a4d5e1e2 Check all entries in result 
Without this change, we ony check the first return from state tests, if
there is more than one state run, we do not check subsequent tests.
 2017-06-02 17:26:07 -06:00
Sergey Kizunov
07d5862773 unit.transport.tcp_test: Clean up channel after use 
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-05-31 18:30:19 -05:00