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,872 Commits 24 Branches 182 Tags 341 MiB
9ff03c2d43
Commit Graph

8951 Commits

Author SHA1 Message Date
Mike Place
f16b7246e4 Merge pull request #43103 from aogier/43101-genesis-bootstrap 
genesis.bootstrap deboostrap fix
 2017-08-25 14:48:23 -06:00
Mike Place
5471f9fe0c Merge pull request #43196 from gtmanfred/2016.11 
Pin request install to version for npm tests
 2017-08-25 12:43:05 -06:00
Daniel Wallace
ccd2241777 Pin request install to version 
This fails on centos 6 because its node is too old to support the version of
hawk bumped here https://github.com/request/request/pull/2751, we can still
test the functionality.  This will pull from github, and install a specific tag
version, and we still do the uninstall using the github path.

This should be more stable.
 2017-08-25 10:23:35 -06:00
Alessandro -oggei- Ogier
db94f3bb1c better formatting 2017-08-24 15:07:08 +02:00
Alessandro -oggei- Ogier
e5cc667762 tests: fix a leftover and simplify some parts 2017-08-24 15:04:37 +02:00
Alessandro -oggei- Ogier
13e5997457 lint 2017-08-24 12:49:39 +02:00
Alessandro -oggei- Ogier
216ced69e5 allow comma-separated pkgs lists, quote args, test deb behaviour 2017-08-24 12:00:36 +02:00
Daniel Wallace
35e45049e2 use a ruby gem that doesn't have dependencies 2017-08-18 08:55:02 -04:00
garethgreenaway
2957467ed7 Merge pull request #43026 from rallytime/bp-43020 
Back-port #43020 to 2016.11
 2017-08-17 16:19:46 -07:00
garethgreenaway
51d16840bb Merge pull request #42890 from DSRCorporation/bugs/42627_salt-cp 
Make chunked mode in salt-cp optional
 2017-08-17 11:37:43 -07:00
Daniel Wallace
0eb15a1f67 test with gem that appears to be abandoned 2017-08-17 14:28:39 -04:00
Erik Johnson
4089b7b1bc Use socket.AF_INET6 to get the correct value instead of doing an OS check 
This builds on #43014 with a more future-proof solution.
 2017-08-17 12:12:27 -05:00
Ch3LL
b8eee4401e Change AF_INET6 family for mac in test_host_to_ips 2017-08-17 10:55:53 -04:00
rallytime
c6b9ca4b9e Lint fix: add missing space 2017-08-15 14:26:44 -04:00
rallytime
5597b1a30e Skip 2 failing tests in Python 3 due to upstream bugs 2017-08-15 14:26:44 -04:00
rallytime
a0b19bdc27 Update account id value in boto_secgroup module unit test 
This value was updated in moto 1.0.0 with the following commit:

5f3fbff627
 2017-08-15 14:23:00 -04:00
rallytime
60b406e088 @mock_elb needs to be changed to @mock_elb_deprecated as well 2017-08-15 14:23:00 -04:00
rallytime
6ae1111295 Replace @mock_ec2 calls with @mock_ec2_deprecated calls 
moto versions >= 1.0.0 have changed the way the mocked connections through
boto are handled with the @mock_ec2 decorator. They use the boto3 connection
method. However, since we are still using boto in many places, we need to use
the new @mock_ec2_deprecated decorator instead to handle the boto connection
functions for the unit tests.

Versions of moto < 1.0.0 are not Python 3 compatible, so salt-jenkins should
be installing newer versions of moto for those tests. Unfortunately, we cannot
install an older version of moto for Python2 that use the original @mock_ec2 call
and also import the @mock_ec2_deprecated function for newer versions of moto
simultaneously as the @mock_ec2_deprecated function doesn't exist in older
versions of moto.
 2017-08-15 14:22:59 -04:00
Dmitry Kuzmenko
9fedf6012e Fixed 'test_valid_docs' test. 2017-08-14 10:54:16 +03:00
Daniel Wallace
da3402a53d make sure cmd is not run when npm isn't installed 
apparently the skipIf on the functions still get run, even if the function is
going to be skipped based on a skipIf on the class.
 2017-08-11 10:58:00 -06:00
Daniel Wallace
b458b89fb8 skip cache_clean test if npm version is >= 5.0.0 2017-08-10 14:17:47 -06:00
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