Commit Graph

7145 Commits

Author SHA1 Message Date
rallytime
a671f0a092 Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720
Refs #35720
2016-08-24 17:48:45 -06:00
Nicole Thomas
9fe0972761 Merge pull request #35662 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-08-22 13:03:43 -06:00
Justin Anderson
64974c89d9 Backport #35627 to 2016.3 (#35661)
* This test was doing all sorts of things, raging from simply failing
to driving CPUs to 100%, to leaking memory until the entire test suite crashes.

This seems to happen only in conjunction with running the entire unit test suite
and does not occur on its own

cc: @kraney

* Better method to skip test. This way we can track it.
2016-08-22 13:03:24 -06:00
rallytime
1d819d7cc2 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-08-22 09:29:13 -06:00
Mike Place
4153aeba29 Merge pull request #35605 from rallytime/bp-32739
Back-port #32739 to 2016.3
2016-08-20 10:39:38 +09:00
Thomas S Hatch
c9070c212f Merge pull request #35569 from rallytime/test-for-35384
Write test for multiple unless commands where 1st cmd passes and 2nd fails
2016-08-19 13:28:01 -06:00
rallytime
f2eb625778 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-08-19 11:13:15 -06:00
abednarik
36d8b4a409 Rsync synchronized updates.
Aadded --dry-run option which is also used for test mode
taking adventage of this option in rsync.

Update state documentation to follow Salt standards

Finally synchronized was not working, See #32478. Changes cmd.run to cmd.run_all make this works.
Tests updated
2016-08-19 10:42:37 -06:00
Erik Johnson
4f0b3be20c Fix localemod tests (#35583)
This changes the mocking for the context variables to reflect changes
made in 5b12f03.
2016-08-18 20:56:20 -06:00
Erik Johnson
beb6ca8ef9 Update linux_sysctl tests to reflect new context key (#35584)
* Update docstring to reflect optional context argument

It used to not be optional.

* Update linux_sysctl tests to reflect new context key

This key was changed in 5b12f03, this updates the tests to reflect the
change.
2016-08-18 20:56:08 -06:00
rallytime
2930df924e Update localemod_test systemd.sd_booted mock to use salt.utils.systemd.booted
This brings these tests inline with the changes made to salt.utils.systemd.booted
in #35510
2016-08-18 13:31:26 -06:00
rallytime
e61b04a707 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/clouds/digital_ocean.py
  - salt/cloud/clouds/ec2.py
  - salt/cloud/clouds/libcloud_aws.py
  - salt/cloud/clouds/opennebula.py
  - salt/cloud/clouds/rackspace.py
  - salt/cloud/clouds/softlayer.py
  - salt/cloud/clouds/softlayer_hw.py
  - salt/cloud/clouds/vmware.py
  - salt/loader.py
  - salt/modules/aptpkg.py
  - salt/modules/ebuild.py
  - salt/modules/pacman.py
  - salt/modules/systemd.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/scripts.py
  - salt/utils/cloud.py
2016-08-18 12:09:51 -06:00
rallytime
30f42d5352 Write test for multiple unless commands where 1st cmd passes and 2nd fails
This is a regression integration test for #35384, which was fixed by #35545,
and back-ported to the 2015.8 branch in #35566.
2016-08-18 11:04:08 -06:00
Mike Place
205d8e2e7b Merge pull request #35483 from gtmanfred/2015.8
use __utils__ in salt.cloud
2016-08-18 22:32:22 +09:00
Thomas S Hatch
fd3274c800 Merge pull request #35510 from terminalmage/issue33516
Better systemd integration
2016-08-17 12:54:11 -06:00
Erik Johnson
5b5f19d269 Update zypper unit test to reflect call to config.get 2016-08-17 11:43:22 -05:00
rallytime
c305d8d99b Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/conf.py
  - tests/runtests.py
2016-08-17 10:37:57 -06:00
Erik Johnson
f83e0ef242 Add unit tests for salt.utils.systemd 2016-08-17 11:30:14 -05:00
Mike Place
9f87081cef Merge pull request #35302 from Ch3LL/add_job_cache_test
Add job cache test
2016-08-17 19:45:28 +09:00
Mike Place
c1deb945d7 Merge pull request #35429 from tankywoo/fix-iptables-target-options
Fix iptables target options with no arguments
2016-08-17 19:05:17 +09:00
Ch3LL
ccb2a5cadf remove unused imports 2016-08-16 15:21:20 -06:00
Ch3LL
512ae81dfd remove TMP and add integration.TMP 2016-08-16 15:18:24 -06:00
Daniel Wallace
2d8ec1e9db use __opts__ in salt.utils.cloud for cache functions 2016-08-16 12:03:45 -05:00
rallytime
c6c82be1de Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/deploy/bootstrap-salt.sh
2016-08-16 11:02:05 -06:00
Thomas S Hatch
240fc12863 Merge pull request #35413 from cachedout/issue_35296
Resolve path issues with cp.push
2016-08-16 10:40:39 -06:00
Tanky Woo
914eb60d51 Fix iptables target options with no arguments
For example:

  - name: test
    jump: CT
    notrack: ''
    ...
2016-08-16 16:00:00 +08:00
Mike Place
1473474b04 Merge pull request #35451 from isbm/isbm-zypper-mod_repo-unchanged
Bugfix: zypper mod repo unchanged
2016-08-16 10:38:25 +09:00
anthony-shaw
e427815caf fix clrf 2016-08-15 16:30:58 -06:00
anthony-shaw
06530b5461 add a test to check existing functionality is broken 2016-08-15 15:53:05 -06:00
Graham McCullough
ae5b233d51 fixes #34279 2016-08-15 14:34:20 -07:00
Nicolas Delaby
49af330492 Docker 1.12 reports tags as null (#35447)
Add support for this new value.
2016-08-15 10:58:50 -06:00
Bo Maryniuk
8790197d86 Fix Unit test for suppressing the exception removal on non-modified repos 2016-08-15 17:35:25 +02:00
Mike Place
3646cf1afa Additional checks on master and integration test 2016-08-12 20:06:20 +09:00
Mike Place
fc0d5878bc Set file_recv on test master 2016-08-12 19:08:27 +09:00
rallytime
cf038ee3fe Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/grains/core.py
  - salt/modules/file.py
  - salt/modules/hosts.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/portage_config.py
  - salt/modules/x509.py
  - salt/scripts.py
  - tests/integration/shell/enabled.py
2016-08-11 11:33:54 -06:00
Mike Place
69a108e9fa Raise SaltRenderError on bad requisite (#35373)
* Raise SaltRenderError on bad requisite

Refs #35226

* Remove extra vals
2016-08-11 10:48:23 -06:00
Erik Johnson
a375dd7e1f Clean up open filehandles (#35359)
* salt/crypt.py: clean up open filehandles

* salt/fileclient.py: clean up open filehandles

* salt/grains/core.py: clean up open filehandles

* salt/modules/cp.py: clean up open filehandles

* salt/modules/data.py: clean up open filehandles

* salt/modules/dnsutil.py: clean up open filehandles

* salt/modules/dockerng.py: clean up open filehandles

* salt/modules/inspectlib/collector.py: clean up open filehandles

* salt/modules/file.py: clean up open filehandles

* salt/modules/hosts.py: clean up open filehandles

* salt/modules/incron.py: clean up open filehandles

* salt/modules/dpkg.py: clean up open filehandles

* salt/modules/linux_sysctl.py: clean up open filehandles

* salt/modules/netbsd_sysctl.py: clean up open filehandles

* salt/modules/network.py: clean up open filehandles

* salt/modules/nftables.py: clean up open filehandles

* salt/modules/openbsd_sysctl.py: clean up open filehandles

* salt/modules/rh_ip.py: clean up open filehandles

* salt/modules/portage_config.py: clean up open filehandles

* salt/modules/status.py: clean up open filehandles

* salt/modules/tls.py: clean up open filehandles

* salt/modules/xapi.py: clean up open filehandles

* salt/modules/x509.py: clean up open filehandles

* salt/modules/virt.py: clean up open filehandles

* salt/modules/zcbuildout.py: clean up open filehandles

* salt/returners/local_cache.py: clean up open filehandles

* salt/utils/cloud.py: clean up open filehandles

* salt/states/pkgrepo.py: clean up open filehandles

* salt/states/x509.py: clean up open filehandles

* salt/transport/mixins/auth.py: clean up open filehandles

* salt/utils/__init__.py: clean up open filehandles

* salt/states/pkg.py: clean up open filehandles

* salt/utils/minion.py: clean up open filehandles

* salt/utils/openstack/nova.py: clean up open filehandles

* salt/utils/openstack/swift.py: clean up open filehandles

* salt/utils/process.py: clean up open filehandles

* salt/utils/templates.py: clean up open filehandles

* salt/utils/virt.py: clean up open filehandles

* tests/integration/__init__.py: clean up open filehandles

* tests/integration/cli/grains.py: clean up open filehandles

* tests/integration/client/standard.py: clean up open filehandles

* tests/integration/modules/hosts.py: clean up open filehandles

* tests/unit/utils/vt_test.py: clean up open filehandles

* tests/integration/shell/enabled.py: clean up open filehandles

* tests/integration/states/cmd.py: clean up open filehandles

* tests/integration/states/file.py: clean up open filehandles

* tests/integration/states/match.py: clean up open filehandles

* tests/unit/config_test.py: clean up open filehandles

* tests/unit/templates/jinja_test.py: clean up open filehandles

* tests/unit/utils/find_test.py: clean up open filehandles

* tests/integration/modules/state.py: clean up open filehandles

* Update dnsutil_test to reflect changes in fopen usage
2016-08-11 10:45:24 -06:00
Mike Place
0fcfc70cc8 Merge pull request #35356 from jfindlay/log_levels
document log levels and warn on all logging below info
2016-08-11 09:45:55 +09:00
Justin Findlay
2fc3a55338 utils.verify.verify_log: warn at all levels less than info 2016-08-10 14:10:43 -06:00
rallytime
a651962e95 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-08-10 10:02:03 -06:00
Ch3LL
c9b7c3cf80 need to add returners option in other places 2016-08-09 13:53:42 -06:00
Erik Johnson
243909f39d file.recurse: Do not convert octal mode string to int (#35309)
* Add integration test for #34945

* file.recurse: Do not convert octal mode string to int

When we run file.makedirs_perms to create the dest directory, we pass
through the mode to file.check_perms. However, file.check_perms expects
an octal string, not an int. This causes the initial directory to be
chmod'ed to the wrong mode. When there are files in the source
directory, file.recurse will invoke the file.directory state to manage
files/dirs in that directory, and this ends up correcting the mode as we
simply pass the dir_mode to it. However, when there are only directories
in the source directory, this never happens and the incorrect mode
remains on the destination directory.

Fixes #34945.
2016-08-09 13:02:26 -06:00
rallytime
2d3eadfe49 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-08-09 11:15:48 -06:00
Ch3LL
7316df7a02 fix pylint 2016-08-09 10:35:01 -06:00
Mike Place
ce7aeb6ca4 Merge pull request #35227 from isbm/isbm-osfinger-ubuntu-fix
Isbm osfinger ubuntu fix
2016-08-10 00:38:30 +09:00
Ch3LL
50a4f0fe6a fix comment 2016-08-09 09:26:51 -06:00
Erik Johnson
d621aa7b61 Update runner/wheel unit tests to reflect new key in ret dict 2016-08-09 08:49:52 -05:00
Ch3LL
6837acf742 add job cache integration tests 2016-08-08 17:01:02 -06:00
rallytime
2b4c156df1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/grains/core.py
  - salt/output/highstate.py
2016-08-08 11:15:43 -06:00
Pablo Suárez Hernández
18700e821e unit tests for rpm.checksum() and zypper.download()
lint issue fixed
2016-08-08 11:57:14 +01:00