valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,490 Commits 24 Branches 182 Tags 341 MiB
0186045169
Commit Graph

3818 Commits

Author SHA1 Message Date
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
df693423b9 Move salt.utils.rm_rf to salt.utils.files.rm_rf 
Also added a deprecation warning to utils/__init__.py and updated
all references to rm_rf in salt codebase.
 2017-07-18 10:48:54 -06:00
rallytime
ccf790a83f Update all references for moved functions to use "files" util 
- fopen
- flopen
- fpopen
- safe_rm
- is_empty
- is_fcntl_available
 2017-07-18 10:31:01 -06: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
rallytime
7e0c099ab3 Add get_driver function used with libcloud modules to doc exception list 
Fixes failing valid_docs test in develop
 2017-07-11 09:13:38 -06:00
rallytime
8d960d463a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/grains/core.py
 2017-07-06 17:42:30 -06: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
rallytime
4d96cc1068 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-07-03 09:28:18 -06:00
Mike Place
d36f0ec0f0 Merge pull request #42051 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-06-30 15:54:53 -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
rallytime
9227a1263d Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-30 10:00:01 -06: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
80f53cd98c Replace cloud test __random_name funcs with new generate_random_name helper 2017-06-29 16:11:07 -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
Erik Johnson
9a50e7c1ca Merge remote-tracking branch 'upstream/2017.7' into merge-develop 2017-06-28 22:10:50 -05:00
rallytime
e512a29f08 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/state.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - salt/version.py
  - tests/unit/config/test_config.py
  - tests/unit/modules/test_zypper.py
 2017-06-28 11:31:53 -06: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
garethgreenaway
c1245acaad Merge branch 'develop' into pr-35533 2017-06-19 18:47:29 -07:00
Dmitry Kuzmenko
dd4273e268 Temporary POC: disable runtests log handler for Py3 tests. 2017-06-19 22:26:06 +03:00
rallytime
4780e99ac2 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-16 11:53:38 -06:00
jmacfar
dba9558b73 Support cp.get_file|url to download files to a directory 
Integrations tests
 2017-06-16 10:45:18 -05: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
9c45fa044d Merge pull request #41748 from terminalmage/issue3415 
Add comparison operator support for package installation in yum/dnf and apt
 2017-06-15 15:32:37 -05: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
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
 2017-06-15 10:57:27 -06:00
Mike Place
d8b83af3d6 Merge pull request #41745 from terminalmage/fix-runtests-helpers 
Fix runtests_helpers.modules_available when multiple modules passed
 2017-06-15 10:14:16 -05:00
Mike Place
c58f3811ce Merge pull request #41746 from rallytime/version-added-nitrogen 
Update Nitrogen references to 2017.7.0
 2017-06-15 10:12:18 -05:00
Mike Place
b0556bd58b Merge branch 'develop' into issue3415 2017-06-15 10:09:46 -05:00
rallytime
33905fd520 Disable new part of test_exit_status_correct_usage test for now 
This new part of the test_exit_status_correct_usage test was added
in PR #41382. This test, along with some memory leakage for the
test running in Python 3, has exposed an underlying issue with
Minion._thread_return subprocessing in the test suite. Due to this
issue, this test is extremely flaky.

Per @DmitryKuzmenko's recomendation in https://github.com/saltstack/salt-jenkins/issues/378,
this test should be commented out for the time being. He is planning
on coming back to this issue to uncomment the test once the underlying
problem has been resolved.
 2017-06-15 08:44:34 -06:00
Erik Johnson
444e45b8e8 Add support for comparison operators to pkg.install (yum/dnf, apt) 2017-06-14 13:21:02 -05:00
Erik Johnson
5c970d81e5 Fix runtests_helpers.modules_available when multiple modules passed 
tests.support.helpers passes the single-asterisk tuple of args as
individual arguments to runtest_helpers.modules_available. This breaks
tests which pass more than one argument to the requires_salt_modules
decorator.

This has been fixed by making runtests_helpers.modules_available accept
an arbitrary number of args via using a single-asterisk.
 2017-06-14 13:16:30 -05:00
Erik Johnson
23634a305b Fix runtests_helpers.modules_available when multiple modules passed 
tests.support.helpers passes the single-asterisk tuple of args as
individual arguments to runtest_helpers.modules_available. This breaks
tests which pass more than one argument to the requires_salt_modules
decorator.

This has been fixed by making runtests_helpers.modules_available accept
an arbitrary number of args via using a single-asterisk.
 2017-06-14 13:12:27 -05:00
rallytime
b0145578bf Update Nitrogen references to 2017.7.0 for states, utils, tests directory 
Also updated version.py with release tuple
 2017-06-14 11:54:27 -06:00
rallytime
74d9a36d5a Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - pkg/salt-proxy@.service
  - salt/modules/npm.py
  - salt/modules/parted.py
  - tests/integration/modules/test_libcloud_dns.py
 2017-06-13 15:01:51 -06:00
rallytime
bdf33d7f5f Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-13 09:26:05 -06:00
Nicole Thomas
740e933028 Merge pull request #41703 from gtmanfred/nitrogen 
mark all mac power tests as flaky
 2017-06-12 16:03:15 -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
Daniel Wallace
b202505923 mark all mac power tests as flaky 
After talking to @cro, all of the mac power modules became super flaky in
Sierra.  Because of this, I am marking all of the mac power tests with the
flaky decorator.
 2017-06-12 13:34:12 -06:00
Erik Johnson
a29b458416 Update orphan finding code to handle differences in psutil on PY3 
This should fix the remainder of the test flakiness for
integration.shell.test_proxy.ProxyTest.test_exit_status_correct_usage
 2017-06-09 15:20:23 -05:00
rallytime
c027f988a7 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-06-08 16:45:48 -06:00
Nicole Thomas
c292b1161f Lint: quick fix to add missing blank line 2017-06-08 16:04:59 -06:00
Daniel Wallace
5010e1a89d Disable libcloud test if the module doesn't load 
This is causing the mac tests to fail.  apache-libcloud 0.20.1 is what is being
imported, and the libcloud_dns module is not being used.
 2017-06-08 11:27:24 -06:00
Erik Johnson
0428617b52 Wait for orphans in test_exit_status_correct_usage 
Also ensure that the shutdown will be run even when assertions fail
 2017-06-08 00:44:52 -05:00
Erik Johnson
cb91437b08 Add wait_for_orphans to testprogram classes 
This allows for the shutdown function to also terminate any orphaned
processes which were spawned during the time between when
terminate_process is invoked, and when the processes are actually
killed.
 2017-06-08 00:25:53 -05:00
Nicole Thomas
93a31500c8 Merge branch 'develop' into pillar_top_wildcard 2017-06-07 17:05:06 -06:00
Mike Place
143dad59af Merge pull request #41408 from s0undt3ch/nitrogen 
Partially revert 1b84bee06. Fixes #40517
 2017-06-07 12:05:25 -05:00
rallytime
396b06fdf8 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-06-07 09:54:20 -06:00
Mike Place
45326ccdec Merge pull request #41621 from gtmanfred/mac 
Fix some mac tests
 2017-06-07 10:19:25 -05:00
Erik Johnson
913450bd45 Merge pull request #41620 from Ch3LL/skip_mac_git 
Skip git_pillar tests on MacOSX
 2017-06-07 09:07:01 -05:00
Marlowe W
88bd2bd189 Merge branch 'develop' into pillar_top_wildcard 2017-06-07 09:51:36 +08:00
Ch3LL
0e35605f20
Skip git_pillar tests on MacOSX 2017-06-06 17:17:57 -04:00
C. R. Oldham
4540f82aaa Port salt-proxy tests to the testsuite changes in Nitrogen. 2017-06-06 13:49:16 -06:00
Daniel Wallace
b25b487ceb create home directory for issue-1959 
Fixes https://github.com/saltstack/salt-jenkins/issues/388
 2017-06-06 13:32:57 -06:00
rallytime
1a40e105e5 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - tests/integration/__init__.py
  - tests/integration/modules/test_state.py
 2017-06-06 12:57:44 -06:00
rallytime
2cb4f2baa9 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/states/keystone.py
 2017-06-06 12:50:35 -06:00
Mike Place
53ecb5c4b0 Merge pull request #41553 from terminalmage/issue41527 
Fix installing RPMs via remote URLS which are 30x redirects
 2017-06-06 13:23:41 -05:00
Daniel Wallace
fd23f7dad3 Mark known flaky mac power test 2017-06-06 12:19:45 -06:00
Ch3LL
8d27bb31b2
Disable home dir check for mac in more test_user tests 2017-06-06 11:20:18 -04:00
Ch3LL
85e77c9cc8
Disable home dir check for mac in test_user 2017-06-06 11:02:19 -04:00
Nicole Thomas
ebfc9f214a Merge pull request #41594 from Ch3LL/fix_mac_check_cmd 
change group to wheel for macosx in tests
 2017-06-05 20:45:02 -06:00
Nicole Thomas
be0683de78 Merge pull request #41595 from gtmanfred/nitrogen 
Make sure runtests_engine is ASCII text
 2017-06-05 20:43:50 -06:00
Nicole Thomas
fa9d7015ca Merge pull request #41589 from Ch3LL/fix_locale_map 
Skip locale tests on MacOSX
 2017-06-05 20:42:48 -06:00
Daniel Wallace
19ea5481b6 remove test that never passed 2017-06-05 17:45:23 -06:00
Daniel Wallace
f309bae8b4 Make sure runtests_engine is ASCII text 
If this is has any unicode characters in it, it won't load on systems that do
not default to a unicode locale.

find . -type f | while read line; do ret=$(file $line); if [[ $ret == *UTF-8* && $line == *.py ]]; then echo $line; fi; done

The above will list all files that have unicode characters in it and won't load
with locale set to C or POSIX
 2017-06-05 17:30:28 -06:00
Erik Johnson
8e380679cc Kill child PIDs when shutting down a testprogram daemon 
This fixes the test failures recently observed in
integration.shell.test_master.MasterTest.test_exit_status_correct_usage.
The test failures were not a regression, but rather a symptom of a
greater problem with the TestProgram class' shutdown() func. When
terminating the process using the terminate_process helper from
pytest-salt, it does not pass kill_children, which defaults to False.
This makes the helper only kill the main PID, leaving all the other PIDs
running.

This means that every time the integration suite was being run, each
time the TestProgram class was used to spawn a temporary daemon, it
would leave all the child PIDs running when the shutdown() is invoked.

By passing kill_children=True, we ensure that the child PIDs are also
killed. This should provide a significant perfomance improvement in the
test suite.
 2017-06-05 16:38:23 -05:00
Ch3LL
ddcb1ca9a7
change group to wheel for macosx in tests 2017-06-05 17:16:54 -04:00
Ch3LL
8c10cbd01d
Skip locale tests on MacOSX 2017-06-05 15:57:20 -04:00
Marlowe W
d50675396d Merge branch 'develop' into pillar_top_wildcard 2017-06-05 13:06:16 +08: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
rallytime
833b2145c4 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-06-01 17:15:36 -06:00
Erik Johnson
c512142899 Add integration test for cp.cache_file 2017-06-01 17:20:58 -05:00
Pedro Algarvio
451d8f98e3
The file listing needs to be sorted to return expectable results. 
This seems like the only reasonable way to override, for example, grains.
Grains from `custom_grains_2` should override grains from `custom_grains_1`.
 2017-06-01 18:47:22 +01:00
Dmitry Kuzmenko
fef0e0ea67 Catch errors on socket.shutdown. 
It throws an exception if the socket wasn't connected.
 2017-06-01 16:49:57 +03:00
rallytime
e848c67682 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/states/keystone.py
 2017-05-31 14:39:33 -06:00
Marlowe W
d76228a02a Merge branch 'develop' into pillar_top_wildcard 2017-05-31 10:10:43 +08:00
Mike Place
713a671f09 Merge pull request #41471 from terminalmage/blockreplace-test 
Fix a file.blockreplace test for Python 3
 2017-05-30 13:48:22 -05:00
rallytime
8c1dc36a8b Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/modules/zypper.py
  - salt/utils/parsers.py
 2017-05-30 10:20:44 -06:00
rallytime
675937e0ab Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - tests/unit/states/test_keystone.py
 2017-05-30 10:16:14 -06:00
Mike Place
491d4d941a Merge pull request #41430 from DSRCorporation/bugs/py3_tests_nitrogen 
One more bunch of tests fixes.
 2017-05-26 16:53:37 -05:00
Mike Place
1a74084c38 Merge pull request #41463 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-26 16:35:47 -05:00