valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,779 Commits 24 Branches 182 Tags 341 MiB
d2e91c33bd
Commit Graph

3722 Commits

Author SHA1 Message Date
Ch3LL
d2e91c33bd
Add spm shell tests 2017-10-12 15:31:48 -04:00
Daniel Wallace
f84b50a06b
results and columns are lists for mysql returns 2017-09-19 15:08:17 -06:00
rallytime
d40eba6b37 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/states/git.py
 2017-08-25 16:07:27 -04: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
rallytime
84829a6f8c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/jenkins.py
  - salt/states/jenkins.py
 2017-08-18 09:13:54 -04: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
Daniel Wallace
ba80a7d4b5 use a ruby gem that doesn't have dependencies 2017-08-17 13:45:10 -06: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
Daniel Wallace
0a1f40a664 test with gem that appears to be abandoned 2017-08-17 10:38:32 -06:00
Erik Johnson
8165f46165 Add debug logging to troubleshoot test failures 
This adds logging to troubleshoot https://github.com/saltstack/salt-jenkins/issues/477
 2017-08-14 16:28:09 -05:00
Dmitry Kuzmenko
9fedf6012e Fixed 'test_valid_docs' test. 2017-08-14 10:54:16 +03:00
rallytime
fb7117f2ac Use salt.utils.versions.LooseVersion instead of distutils 2017-08-11 16:31:24 -04:00
rallytime
29ff19c587 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/states/dockerng.py
  - salt/utils/cloud.py
 2017-08-11 15:17:19 -04:00
Erik Johnson
462d653082 Move weird tearDown test to an actual tearDown 
Also catch KeyError when user doesn't exist
 2017-08-11 12:20:50 -05: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
Erik Johnson
c69f17dd18 Add integration test for #42774 2017-08-08 14:20:42 -05:00
Nicole Thomas
083ff00410 Merge pull request #42474 from whiteinge/cmd-arg-kwarg-parsing-test 
Cmd arg kwarg parsing test
 2017-07-24 08:13:29 -06:00
Seth House
0cc0c0967a Lint fixes 2017-07-21 16:14:32 -06:00
Seth House
622ff5be40 Add LocalClient.cmd test for arg/kwarg parsing 2017-07-20 14:28:24 -06:00
rallytime
c673b64583 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/conf.py
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/engines/hipchat.py
  - salt/engines/slack.py
  - salt/grains/core.py
  - salt/version.py
  - tests/integration/states/test_renderers.py
 2017-07-20 09:54:08 -06: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
rallytime
7aa31ff030 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/modules/pillar.py
  - salt/states/saltmod.py
  - salt/states/user.py
  - tests/integration/states/handle_iorder.py
 2017-07-18 09:05:43 -06: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
d15f7ded82 Add integration test for 42116 2017-07-05 11:07:38 -05:00
Erik Johnson
9a268949e3 Add integration test for 42116 2017-07-05 00:48:50 -05:00
Erik Johnson
3071bb7a37 Add debug logging for grains tests 
The assert doesn't tell us anything about the grain that is failing.
This adds some debug logging to make this easier to troubleshoot.
 2017-06-30 15:39:48 -05:00
Nicole Thomas
951ed4a9c9 Merge pull request #42032 from terminalmage/py3-tests 
Avoid race condition when iterating through processes
 2017-06-30 08:29:54 -06:00
rallytime
a77e1bd9dd Add integration test for salt.cloud.CloudClient.create() function 2017-06-29 14:37:12 -06:00
Erik Johnson
d31939574b Avoid race condition when iterating through processes 
If a process has already exited between when psutil.process_iter() was
invoked, and when we invoke the cmdline() func, it will raise an
exception. This commit catches this exception and skips these processes.
 2017-06-29 15:08:17 -05:00
rallytime
7d7be2d375 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/ref/configuration/master.rst
  - tests/integration/states/test_archive.py
  - tests/unit/transport/test_tcp.py
  - tests/unit/transport/test_zeromq.py
 2017-06-28 10:48:37 -06:00
Denys Havrysh
54910fe55f archive.extracted: fix hash sum verification for local archives 2017-06-26 19:08:47 +03:00
Ch3LL
9a4b3dbaba Fix some formatting 2017-06-23 18:46:25 -04:00
Ch3LL
73271ce94d Add vmware test to check new disk on seperate datastore 2017-06-23 18:36:50 -04:00
Mike Place
bee68beb8e
Lint fix 2017-06-23 10:18:06 -06:00
Mike Place
048befb5fe
Fix lint 2017-06-22 15:36:21 -06:00
Mike Place
7697d0d1d2
Remove merge conflict line 2017-06-22 12:35:28 -06:00
Mike Place
481797b147
Merge branch '2016.11' into '2017.7' 2017-06-21 15:49:39 -06:00
Mike Place
6e9e0714f0
Merge forward from 2016.11 to 2017 2017-06-21 14:51:02 -06:00
Mike Place
f720a849ba Merge pull request #41795 from isbm/isbm-suse-upstream-leftovers 
Things, that didn't made to 2017.7 for some reasons
 2017-06-20 09:28:21 -05:00
Dmitry Kuzmenko
dd4273e268 Temporary POC: disable runtests log handler for Py3 tests. 2017-06-19 22:26:06 +03:00
Bo Maryniuk
e9de0746ae Fix grain for os_family on SUSE series 2017-06-16 14:39:08 +02:00
Piotr Kaźmierczak
ea4d085694 fixing beacons.list integration test failure 2017-06-16 14:39:08 +02: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
Mike Place
b12611d122 Merge pull request #41617 from cro/n_proxy_tests 
Port salt-proxy tests to the testsuite changes in Nitrogen.
 2017-06-15 12:07:29 -05:00