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
74,698 Commits 24 Branches 182 Tags 341 MiB
f7d8bc7cc7
Commit Graph

4801 Commits

Author SHA1 Message Date
Hengyang Hu
b89f45598e fix 34241, webutil.useradd_all is deprecated (#35788) 
* fix 34241, webutil.useradd_all is deprecated

* in src webutil.useradd_all get replaced by webutil.useradd, change the mocks accordingly
 2016-08-26 12:52:11 -06:00
Erik Johnson
eb4d2f299b Better unicode handling in gitfs (#35802) 
* Revert "Don't use six.text_type() in salt.utils.gitfs"

This reverts commit d76659a63a.

* salt.utils.path_join: handle mixed unicode/binary-unicode paths

* Add test for mixed unicode and binary-unicode paths

* salt.utils.gitfs: replace os.path.join with salt.utils.path_join
 2016-08-26 10:44:22 -06:00
Kris Raney
9b3e48bd6e Fix pylint warnings in test code 2016-08-25 15:51:02 -05:00
Kris Raney
170e8238c8 Add cloud watch events unit tests 2016-08-25 13:30:56 -05:00
rallytime
381debe53b Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
 2016-08-25 10:14:38 -06:00
Thomas S Hatch
b3f6367621 Merge pull request #35753 from rallytime/fix-client-unit-test 
Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720
 2016-08-25 09:55:23 -06:00
rallytime
92f8c836e8 Add cmd_mock back in to function spec 2016-08-25 07:05:52 -06:00
Alexandru Bleotu
e993f99053 Improved salt.utils.vmware.get_content, get_mors_with_properties 
- added optional traversal_spec parameter to both methods, allowing the
  user to specify a different TraversalSpec object to search for content
  (if not specified, the behaviour is that all a traverse all search is
  done)
- the traversal_spec is destroyed only if is created in the method
- added local_properties flag to both methods allowing the retrieval of
  properties of the container object
- added tests for the 2 functions
 2016-08-25 10:42:48 +01:00
rallytime
a671f0a092 Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720 
Refs #35720
 2016-08-24 17:48:45 -06:00
rallytime
61e37d5956 Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/loader.py
  - salt/modules/s3.py
  - salt/utils/s3.py
  - tests/unit/modules/s3_test.py
 2016-08-24 09:58:56 -06:00
Denys Havrysh
38d587c5fe grains.filter_by: lookup_dict key could be a globing pattern 2016-08-24 17:52:14 +03:00
C. R. Oldham
ae9b2726b5 Fix some spelling, add better test for proxy 2016-08-23 16:42:14 -06:00
Justin Anderson
154dafdb89 Fix snapper_test for python26 2016-08-23 15:02:31 -06:00
Nicole Thomas
f3f068be72 Merge pull request #35702 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-23 13:40:50 -06:00
Daniel Wallace
2d2bc1ffea use aws.get_location in s3 modules 
Also load the __utils__ into pillar and fileserver and fileclient so
that this function can be used there with __opts__.

Also sets the default for s3 to 'us-east-1' like it is documented.

Closes #30976
Closes #28913
 2016-08-23 12:12:15 -05:00
Mihai Dincă
c80407ec4b Fix tests (#35693) 
* Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info

* Fix unit/pyobjects_test.py::MapTests::test_map

* Fix tests/unit/pyobjects_test.py::RendererTests::test_extend

* Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
 2016-08-23 10:49:53 -06:00
rallytime
b80ef26cf2 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/minion.py
  - salt/modules/cassandra_cql.py
  - salt/modules/rsync.py
 2016-08-23 10:44:55 -06:00
Alexandru Bleotu
e66841ef69 Improved salt.utils.vmware.wait_for_task 
- improved logging/description
- on success the method returns the result and on error it raises the
  exception it got from vmware
- added unit tests
 2016-08-23 17:07:54 +01:00
C. R. Oldham
424a9a8137 Merge pull request #34059 from alexbleotu/vmware_common-gh 
Vmware common gh
 2016-08-23 09:24:15 -06:00
Mike Place
618254a3f3 Merge pull request #35692 from cachedout/fix_status_test 
Include grains in status moduele for unit test
 2016-08-23 23:38:32 +09:00
Alexandru Bleotu
77e6e5afee Improved connection to a VMware vCenter Server or ESXi host 
- added support for passthrough connections via SSPI
- added function to specify if a connection is made to a vCenter or ESXi host
- added function to disconnect from a vCenter or ESXi host
- added tests for changed/new functions
 2016-08-23 13:46:28 +01:00
Mike Place
08cc903be0 Include grains in status moduele for unit test 2016-08-23 21:09:41 +09:00
Mike Place
9865b07729 Adjust mock for docker test 
cc: @dmacvicar
 2016-08-23 21:04:52 +09:00
Mike Place
b90969089f Merge pull request #35379 from vutny/issue-15061 
grains.filter_by: allow grain value to be a list
 2016-08-23 17:21:40 +09:00
Mike Place
9602a977c3 Merge pull request #35676 from rallytime/fixup-unit-tests 
Fixup unit tests errors that are not registering as failures
 2016-08-23 16:19:17 +09:00
rallytime
b5e5eeecd0 Remove htpasswd unit test for deprecated function that doesn't test anything 2016-08-22 17:14:07 -06:00
rallytime
49798ee301 Remove every.weeks reference: not available in relativedelta 2016-08-22 16:07:36 -06:00
rallytime
e14c930a74 Fixup errors in pillar consul unittests 2016-08-22 15:35:12 -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
Nicole Thomas
92ecbc3b26 Remove deprecated version of status.uptime module function (#35535) 
* Remove the deprecated version of the status.uptime function.

The deprecated version of the function was set to be removed in
Carbon. The Carbon release notes were also updated with this change.

* Remove test_deprecated_uptime unit test

The deprecated version of uptime no longer exists.

* Remove unused import and deprecated uptime reference
 2016-08-22 09:25:21 -06:00
Mike Place
0dc7348f1d Mock sys.exit in salt.utils.extend 
Best not to push an exit into the test suite :]
 2016-08-22 21:37:40 +09:00
Mike Place
7fc803b4bd Try/except the setup call in tornado test as a workaround pending salt-testing release 2016-08-22 19:08:40 +09:00
Mike Place
b09fd9c741 Merge pull request #35632 from s0undt3ch/develop 
Fix hang on test suite termination
 2016-08-22 12:31:08 +09:00
Pedro Algarvio
a0d47fac40
Don't run routines if _handle_payload is not present 2016-08-22 00:36:53 +01:00
Mike Place
9757766c71 Better method to skip test. This way we can track it. 2016-08-21 21:47:08 +09:00
Mike Place
ab6ead3e63 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
 2016-08-21 21:43:52 +09:00
Mike Place
def20eb95d Fix the rest of the locale tests on develop 
Bad mocks
 2016-08-21 16:22:09 +09:00
Mike Place
2452752fa6 Fix one broken locale unittest 2016-08-20 22:42:23 +09:00
Mike Place
579358bb18 Merge pull request #35457 from jtand/properly_skip_win_firewall_test 
Win_firewall_test was not properly gated to windows
 2016-08-20 12:12:13 +09:00
Mike Place
ce481ae3e7 Merge pull request #35477 from bodhi-space/infra1931 
INFRA-1931 - support (present/absent) for hosted zones in states/boto_route53
 2016-08-20 12:09:32 +09:00
Mike Place
41cda642d6 Merge pull request #35518 from cachedout/fix_parallels 
Fix Parallels module and associated tests
 2016-08-20 11:38:44 +09: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
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
7b3fc41868 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/lxc.py
  - salt/cloud/clouds/nova.py
  - salt/cloud/clouds/vmware.py
  - salt/cloud/clouds/vsphere.py
  - salt/cloud/libcloudfuncs.py
  - salt/minion.py
  - salt/modules/yumpkg.py
  - salt/utils/cloud.py
 2016-08-18 14:37:42 -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
Mike Place
205d8e2e7b Merge pull request #35483 from gtmanfred/2015.8 
use __utils__ in salt.cloud
 2016-08-18 22:32:22 +09:00
rallytime
d2340a0aad Merge branch '2016.3' into 'develop' 
Conflicts:
  - pkg/windows/build.bat
  - pkg/windows/build_pkg.bat
  - tests/runtests.py
 2016-08-17 12:13:26 -06:00
Erik Johnson
5b5f19d269 Update zypper unit test to reflect call to config.get 2016-08-17 11:43:22 -05:00
Erik Johnson
f83e0ef242 Add unit tests for salt.utils.systemd 2016-08-17 11:30:14 -05:00
Mike Place
9c814d7d37 Fix Parallels module and associated tests 
The Parallels module had a bug wherein gids would return in an indeterminate manner because it incorrectly assumed that a Python set would be ordered.
 2016-08-18 00:06:09 +09:00
Justin Anderson
a229d5bf93 Update windows gate to use salt.utils.is_windows() 2016-08-17 08:50:38 -06: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
Mike Place
c68616ceb3 Merge pull request #35493 from rallytime/blockdev-mod 
Update the blockdev state to reference the disk execution module.
 2016-08-17 19:03:37 +09:00
rallytime
64e49a43fc Update blockdev references to 'disk' in blockdev state unit test 2016-08-16 15:02:18 -06:00
rallytime
49179ac401 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/integration/files/conf/master
 2016-08-16 12:52:20 -06:00
Tom Williams
9a44645d38 INFRA-1931 - fix testcase test_that_when_describing_vpc_by_id_it_returns_the_dict_of_properties_returns_true 2016-08-16 13:43:08 -04: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
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
64a1d326ad Merge pull request #35388 from DSRCompany/features/27446_minion_data_storage 
Pluggable minion data cache
 2016-08-16 12:00:06 +09: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
Mike Place
c7564d997a Merge pull request #35464 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-16 10:26:54 +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
Justin Anderson
eb42775a49 Fix orderering in test_add_rule 2016-08-15 14:44:37 -06:00
Justin Anderson
c65347b07d Fix failing win_firewall_tests 2016-08-15 13:45:13 -06:00
rallytime
48cc3bdfaa Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/dockerng.py
  - tests/unit/modules/dockerng_test.py
 2016-08-15 13:27:52 -06:00
Justin Anderson
7692fa8277 Win_firewall_test was not properly gated to windows 2016-08-15 11:49:11 -06: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
Mihai Dinca
b0f0b4effc Make sha256 the default hash_type 2016-08-15 10:02:19 +02:00
Dmitry Kuzmenko
63d8246a5c Modular minion data cache. 
Grains, pillar and mine data are now managed by salt.cache subsystem
 2016-08-15 10:34:01 +03:00
Nicole Thomas
6b6f38b0ea Merge pull request #35424 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-13 09:49:14 -06:00
Mike Place
6b8d46975d Merge pull request #35414 from silviud/win_firewall_remoteip 
Win firewall remoteip
 2016-08-13 08:52:51 +09:00
Mike Place
d72f13d9c0 Merge pull request #35415 from meaksh/fix-suse-os-grains-in-develop 
Fixed 'os' and 'os_family' grains for SUSE systems in develop
 2016-08-13 08:50:52 +09:00
rallytime
1fe0b69a6c Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/blockdev.py
  - salt/modules/ddns.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/linux_sysctl.py
  - salt/modules/status.py
  - salt/modules/x509.py
  - salt/utils/process.py
  - salt/utils/verify.py
  - tests/integration/__init__.py
  - tests/integration/modules/state.py
  - tests/integration/states/cmd.py
 2016-08-12 16:21:58 -06:00
Mike Place
182d9a5bf8 Merge pull request #35383 from pablo-ruth/issue_19313 
Issue 19313 / Add support of lvm thinpools
 2016-08-12 21:47:26 +09:00
Mike Place
85ecac8e6e Merge pull request #35392 from m03/more-win_iis-unit-tests 
Add list_apps, list_bindings, remove_site tests to win_iis_test
 2016-08-12 21:43:36 +09:00
Pablo Suárez Hernández
7c1a5f8bc6 Fixed 'os' and 'os_family' grains for SUSE systems 2016-08-12 13:33:27 +01:00
Silviu Dicu
750fde2931 tests and remote_ip renamed to remoteip as per netsh 2016-08-12 08:01:14 -04:00
Nicole Thomas
4b33a19788 Merge pull request #35349 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-11 15:07:43 -06: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
rallytime
69b9342d67 Update grains unit tests: osmajorrelease grain is a str, not an int. 
Refs #35227

These tests will need to be changed back to integers once Nitrogen
is released.
 2016-08-11 10:38:58 -06:00
Morrie Winnett
c14ef8bde8 Add list_apps, list_bindings, remove_site tests 2016-08-11 09:12:52 -07:00
Pablo RUTH
294e02da04 Add tests for thin pools in lvm module 2016-08-11 15:24:18 +02:00
Denys Havrysh
6d80302e54 grains.filter_by: allow grain value to be a list 2016-08-11 16:11:44 +03:00
Mike Place
bc8960f71a Merge pull request #35343 from s0undt3ch/develop 
Add support for other types of pre-releases
 2016-08-11 09:56:45 +09:00
Mike Place
4bbc7b63bc Merge pull request #35344 from dincamihai/patch-0003 
Add test for non-ascii pkg.info_installed
 2016-08-11 09:55:50 +09:00
Mike Place
dfac0dec9f Merge pull request #35368 from rallytime/file-module-deprecations 
Remove contains_regex_multiline function from file module
 2016-08-11 09:36:02 +09:00
rallytime
102fcbe916 Remove contains_regex_multiline function from file module 2016-08-10 16:43:49 -06:00
rallytime
f37255ed16 Move remaining blockdev func unit tests to disk unit tests and delete file 2016-08-10 16:32:14 -06:00
Justin Findlay
2fc3a55338 utils.verify.verify_log: warn at all levels less than info 2016-08-10 14:10:43 -06:00
rallytime
0b1e9e9a78 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/grains/core.py
  - salt/modules/saltutil.py
  - salt/runner.py
  - salt/states/saltmod.py
  - salt/wheel/__init__.py
  - tests/unit/states/saltmod_test.py
 2016-08-10 10:25:32 -06:00
Mihai Dinca
867ead79e5 Add test for non-ascii pkg.info_installed 2016-08-10 17:34:26 +02:00
Pedro Algarvio
5a18b6c626
Add support for other types of pre-releases 2016-08-10 16:05:50 +01:00
Jeffrey 'jf' Lim
921be89d32 Add unit tests for sys.list_renderers 2016-08-10 09:13:08 +08:00
Jeffrey 'jf' Lim
ea23f7d27d Fix bug in sys.list_returners (all non-glob arguments return empty) 2016-08-10 08:43:47 +08:00
Jeffrey 'jf' Lim
70ae9704a0 Fix bug in sys.list_runners (all non-glob arguments return empty) 2016-08-10 08:30:30 +08:00
Jeffrey 'jf' Lim
af19c762f2 Fix up sysmod_test.py unit test file: 
- take a stab at actual mocking
- general fix of tests, including for all *_doc tests
 2016-08-10 04:04:47 +08:00
rallytime
2d3eadfe49 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-09 11:15:48 -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
Erik Johnson
d621aa7b61 Update runner/wheel unit tests to reflect new key in ret dict 2016-08-09 08:49:52 -05:00
Morrie Winnett
04acb5657b Add initial win_iis unit tests 2016-08-09 01:25:43 -07:00
Mike Place
715dc14b9b Merge pull request #35247 from rallytime/carbon-deprecations 
Remove some of the things that are deprecated in Carbon
 2016-08-09 09:00:27 +09:00
rallytime
de4b33f2e1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/client/ssh/shell.py
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/utils/gitfs.py
 2016-08-08 12:34:23 -06:00
Mike Place
5509df911f Merge pull request #35270 from jf/exact_matching_for_sys.list_x_functions 
Exact matching for sys.list_x_functions
 2016-08-09 01:43:08 +09:00
Mike Place
5ffbd852c6 Merge pull request #35184 from rallytime/py3-unit-state-service-test 
PY3: Don't use contextlib.nested - it is deprecated.
 2016-08-09 01:39:10 +09:00
rallytime
4835c31f23 Remove tests for deprecated functions 2016-08-08 09:58:37 -06:00
rallytime
86a5e04417 Pylint fix 2016-08-08 09:53:29 -06:00
Jeffrey 'jf' Lim
474ce496eb Fix linting problem ('at least two spaces before inline comment') 2016-08-08 23:28:52 +08:00
Jeffrey 'jf' Lim
ad1ce91d20 Fix sys.list_returner_functions glob matching (#35255), and also allow it to 
do exact matching for function names
 2016-08-08 20:16:08 +08: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
Jeffrey 'jf' Lim
225d9ff915 Allow sys.list_runner_functions to do exact matching for function names 2016-08-07 14:16:13 +08:00
Jeffrey 'jf' Lim
3491e5dcfa Allow sys.list_{,state_}functions to do exact matching for function names 
Note that this deprecates the matching of sys when provided "sys."
("sys" already works; just use that!).
 2016-08-07 14:16:13 +08:00
Mike Place
afe50c7fc8 Fixup VMWare PR 
Refs #35099
 2016-08-07 07:50:28 +09:00
Mike Place
b778760a30 Merge pull request #35099 from Antillion/salt-cloud-esx_5_5-fixes 
Salt cloud esx 5 5 fixes
 2016-08-07 07:44:41 +09:00
Mike Place
6714e8f386 Fix mock call in disk wipe test 2016-08-07 06:57:20 +09:00
Mike Place
6e7f907d36 Merge pull request #35179 from rallytime/py3-unit-template-tests 
PY3: Fixup jinja template unit tests
 2016-08-07 06:48:51 +09:00
Bo Maryniuk
fe5da97283 Lintfix: E8303 2016-08-06 00:27:34 +02:00
Bo Maryniuk
4dc45f2509 Add grains unit test for Ubuntu systems 2016-08-05 11:55:02 +02:00
Jeffrey 'jf' Lim
06c2407f8d (a la #33775) allow for sys.list_state_modules to do exact matching too 2016-08-04 17:26:49 +08:00
Jeffrey 'jf' Lim
176653eded s/list_modules/list_functions in sysmod_test.py 2016-08-04 12:38:45 +08:00
rallytime
f42ca4b576 PY3: Don't use contextlib.nested - it is deprecated. 
contextlib.nested is deprecated in Python 3. Instead of having two
different ways of handling nested (PY2) vs ExitStacks (PY3), just use
nested with statements for both.
 2016-08-03 14:49:24 -06:00
rallytime
c7c9e3b64b PY3: Fixup jinja template unit tests 2016-08-03 12:45:29 -06:00
Oliver Tupman
af0e0ac165 Resolves issue where no image or clonefrom gives image log error, along with a test for it 2016-08-03 12:16:26 +01:00
Jeffrey 'jf' Lim
dd6ebed1d6 Refactor sys.list_functions 2016-08-03 15:15:47 +08:00
rallytime
72a116b731 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/pkg.py
 2016-08-02 13:05:36 -06:00
Mike Place
be42f8857f Fix docker test 
I think this was originally just a typo
 2016-08-03 04:00:33 +09:00
Mike Place
f8a6fb6d68 Merge pull request #35130 from gtmanfred/py3 
Py3 tests for unit.utils
 2016-08-02 12:24:55 -06:00
Mike Place
f7bfc5dd4a Don't run Windows tests on Linux 2016-08-03 01:53:27 +09:00
Mike Place
dd91006ed7 Merge pull request #35120 from kstreee/fix-missing-first-stream-data 
The '_handle_event_socket_recv' function in Salt Api is missing first data of stream.
 2016-08-02 10:22:50 -06:00
Daniel Wallace
09c5088c3c [PY3] fix warnings_test 
maxint is not available in py3.  It was removed, but maxsize can be used
instead.

https://docs.python.org/3.1/whatsnew/3.0.html#integers
 2016-08-02 10:25:35 -05:00
Daniel Wallace
445c7a2c20 [PY3] python3ize schema test 
thirsty is specified as a boolean

need to copy the top level of kwargs so that the dictionary does not
changes size during the loop.
 2016-08-02 10:25:35 -05:00
Daniel Wallace
f5b1769e0b [PY3] bytes for events_test 2016-08-02 10:25:35 -05:00
Oliver Tupman
5b9e618103 Fixes minor whitespace and comment issues 2016-08-02 09:35:19 +01:00
kstreee
28f793caac Fix missing first data in stream when subscribing stream using a function 'read_async'. 2016-08-02 07:37:25 +00:00
Jeffrey 'jf' Lim
fe87097abd Round out (unit) test cases for sys.list_{functions,modules} 2016-08-02 12:32:54 +08:00
Jeffrey 'jf' Lim
75816fed93 Address linter issues for tests/unit/states/sysmod.py 
("Exactly one space required after comma")
 2016-08-02 12:09:57 +08:00
Jeffrey 'jf' Lim
84a2512605 Throw in "sys." to the unit test for sys.list_functions too 
(source: integration test for sys.list_functions)
 2016-08-02 12:08:45 +08:00
Jeffrey 'jf' Lim
9df1c9933e Unit tests in place of integration tests for sys.list_{functions,modules} 
NOTE that while I modify test_doc(), this is in order to make it pass.
test_doc() should not be seen as a proper test. Please do a better mock!
 2016-08-02 12:08:45 +08:00
Mike Place
f1fbdf12de Merge pull request #35113 from kraney/boto_iot_thing_types 
Support for aws iot 'thing type'
 2016-08-01 18:33:06 -06:00
Winston Liu
ef97c3f474 added unit tests for thing type present/absent states for boto_iot state functions. 2016-08-01 15:23:51 -07:00
Winston Liu
56b41a5f07 additional unit test to cover newly introduce operations on thing type in boto_iot. 2016-08-01 14:46:56 -07:00
rallytime
a2fbbebe86 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/master.py
  - salt/modules/saltutil.py
  - salt/states/saltmod.py
 2016-08-01 13:42:36 -06:00
Mike Place
8fc2c672eb Merge pull request #35034 from thor/feature/tomcat-version-care 
Fixing the Tomcat state's indifference to a lack of versions and incorrect file paths
 2016-08-01 11:36:48 -06:00
Mike Place
98aad37cd6 Merge pull request #35095 from eradman/localemod 
Properly mock localemod unit tests
 2016-08-01 11:26:21 -06:00
Mike Place
3c58b0237d Merge pull request #35049 from terminalmage/zd868 
Fire events for orchestration jobs containing the passed arguments
 2016-08-01 11:07:04 -06:00
Oliver Tupman
922163be2a Adds tests for changes, plus a small refactor to remove a comment 2016-08-01 17:06:57 +01:00
Oliver Tupman
3b79c7c36d Quick refactor to remove duplication and add a test for config validation failure 2016-08-01 17:06:57 +01:00
Oliver Tupman
e37a8e98bd Adds simple, if verbose test to validate the image/clonefrom settings 2016-08-01 17:06:57 +01:00
Eric Radman
80f8b87ce3 Properly mock localemod unit tests 
locale_gentoo* unit tests only pass on Linux systems because the
localedef is in the search path.
 2016-08-01 11:26:13 -04:00
Mike Place
d137c4b986 Merge pull request #34955 from lubyou/fix-dism-on-non-english-systems 
force dism to always output english text
 2016-08-01 06:54:03 -06:00
Erik Johnson
bd4d1d31a0 Add nodegroup_comp unit tests 2016-07-29 19:28:52 -05:00
Erik Johnson
e32644f275 Update state unit tests to use new orchestration_jid param 2016-07-29 12:17:59 -05:00
Mike Place
4fe3397a41 Merge pull request #34921 from tonybaloney/quickstart 
Introduce a template system for extending SaltStack open
 2016-07-28 22:38:10 -06:00
Thor K. H
7f6942ec7f Fixing coding style and change w/o updated test 
Fixed testing for tomcat.wait, as well as updating style. Should resolve
any test errors isolated to the module and/or state.
 2016-07-28 21:24:52 +02:00
Thor K. H
bb38055ae4 Initial work on adapting Tomcat to care correctly 
Ensure that lack of version does not result in blank version being used,
as to avoid certain Java EE applications from having issues with paths
when parallell execution is not "supported".

This fixes #24990 by both not adding a blank version if there is no
version to exract, but also by allowing you to overwrite that there
should be *no* version whether or not your WAR-file ends with `-1.2.3`.

Tests added for specifically dealing with no-to-version scenarios,
as well as several minor documentation tweaks that hopefully aren't too
interruptive!
 2016-07-28 20:02:57 +02:00
rallytime
65f9365ee0 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-28 11:05:54 -06:00
Eric Radman
42222b06fe Remove stray debug print statements (#35019) 
This cleans up the unit test output a bit, mostly leaving deprecation warnings.
 2016-07-28 09:17:27 -06:00
Anthony Shaw
87954a2baf
add newline to test 2016-07-28 12:44:01 +10:00
Anthony Shaw
bc528eb4d0
completed test to check files, names and contents 2016-07-28 11:52:16 +10:00
Anthony Shaw
b7257baade
add test class 2016-07-28 11:41:15 +10:00
Nicole Thomas
b089db6f21 Fix pylint of develop (#35002) 2016-07-27 15:18:29 -06:00
rallytime
35696ad637 Pylint fix 2016-07-27 15:12:41 -06:00
Mike Place
f9fd6ddd8a Fixup #33875 2016-07-27 13:25:59 -06:00
Eu
56b1f6c651 Fix naive fileserver map diff algorithm 
Naively comparing sorted dict keys does not guarantee that maps are equal. We
must compare mtimes for filenames in case keys are the same to make sure there
isnt a modified file.
 2016-07-27 13:24:19 -06:00
Mike Place
48aa151fa6 Fixup #33875 2016-07-27 13:17:57 -06:00
Mike Place
7956dbe568 Merge pull request #33875 from sangoma/correct_map_diff 
Fix naive fileserver map diff algorithm
 2016-07-27 13:14:49 -06:00
Mike Place
aae430d8c1 Merge pull request #34977 from terminalmage/zd868 
Add jid to return from runner/wheel funcs executed within orchestration
 2016-07-27 13:10:57 -06:00
Erik Johnson
c3f9e13fbe Update unit tests to reflect new behavior of WheelClient/RunnerClient 2016-07-27 13:01:24 -05:00
Mike Place
1067c17095 Merge pull request #34826 from rallytime/unit-module-py3-tests 
Python 3 compatibility fixes (execution module unit tests)
 2016-07-27 11:24:00 -06:00
Mike Place
55bb3d09ab Merge pull request #34919 from tonybaloney/libcloud_dns_states 
Add a new state module for managing DNS records and zones through Libcloud
 2016-07-26 11:51:08 -06:00
Johannes Scholz
775ea73578 fix unit tests 2016-07-26 19:46:14 +02:00
Anthony Shaw
6c08afd62b GCE Cloud tests (#34871) 
* add test module

* modify GCE tests to remove mocks

* use certifi, libcloud has also patched the SuSE/Mac cert issues

* skip cert checking

* validate the __virtual__ and import process

* fix munged merge

* fixed lint errors and failing test

* fix dimensiondata tests in the same way whilst I'm here
 2016-07-26 09:24:20 -06:00
Anthony Shaw
ff60aec050 fix munged merge 2016-07-25 15:58:45 +10:00
Anthony Shaw
a3e37cc2d0 Merge branch 'develop' of github.com:saltstack/salt into develop 2016-07-24 20:08:47 +10:00
Anthony Shaw
8df4c35f5c
zone absent with tests 2016-07-24 19:48:11 +10:00
Anthony Shaw
3b5ddcb607
added zone_present state check 2016-07-24 19:45:06 +10:00
Anthony Shaw
4d7f3169f6
added zone_present state check 2016-07-24 19:43:06 +10:00
Anthony Shaw
fa04e2fcf5
use the correct dictionary structure for state changes 2016-07-24 19:30:32 +10:00
Anthony Shaw
fa5ac70183
add record absent logic and tests 2016-07-24 19:16:48 +10:00
Anthony Shaw
7f28b14958
fix tests 2016-07-24 19:06:34 +10:00
Anthony Shaw
51654e9b7a
add record name to mocks 2016-07-24 17:34:29 +10:00
Anthony Shaw
cb13bb6fba
add test with mocked execution module 2016-07-24 17:13:51 +10:00
Erik Johnson
92fffb06a7 Update unit test 
This unit test asserts based on the args with which a function was
called, and the args were changed which broke the test. This fixes the
test.
 2016-07-22 21:21:55 -05:00
Mike Place
38ac79d8bb Merge pull request #34829 from gtmanfred/py3 
[PY3] tests.unit.pillar
 2016-07-22 16:33:47 -06:00
Mike Place
5e0c63c0eb Merge pull request #34886 from eradman/cron 
Preserve trailing lines in crontab
 2016-07-22 16:25:23 -06:00
rallytime
56fb834718 Remove tests that don't test anything 2016-07-22 16:12:16 -06:00
Mike Place
ab84fd273e Merge pull request #34637 from cachedout/int_tests_interfaces 
Int tests interfaces
 2016-07-22 15:58:59 -06:00
Eric Radman
b9be6521db Preserve trailing lines in crontab 
This allows cron.file to install a crontab file that contains trailing
newlines. Previously a change may have been detected on every run.
 2016-07-22 12:18:08 -04:00
Bo Maryniuk
87ffd6dc1e Regression fix: minion ID generator should use FQDN first, if available (#34876) 
* Regression fix: use FQDN first, if available

* Adjust the tests to the new behaviour (FQDN first)
 2016-07-22 09:21:42 -06:00
rallytime
74002ab9e7 Pylint fix 2016-07-22 09:13:33 -06:00
Anthony Shaw
7e5cf2676b
fix munged merge 2016-07-22 14:31:52 +10:00
Anthony Shaw
7f31ccbf1e Merge branch 'develop' of github.com:saltstack/salt into develop 2016-07-22 13:19:34 +10:00
rallytime
9cc385cfcb Python3 doesn't have contextlib.nested 
The with statement supports the nested functionality by default.
 2016-07-21 15:38:00 -06:00
rallytime
2eea37739d Skip boto_elb unit tests for Py3 
These tests were written use the boto.ec2.elb class, which doesn't
exist in Python3. These tests need to be rewritten to run in Py3.
 2016-07-21 15:05:37 -06:00
rallytime
bd899bb6e1 Remove test that doesn't actually test anything 2016-07-21 14:33:02 -06:00
rallytime
8c30261580 Don't check for string encoding in Python 3 
Also fixed a failing zypper test
 2016-07-21 14:33:02 -06:00
rallytime
c2a2c2bb78 Use assertCountEqual instead of assertEqual for lists in Py3 2016-07-21 14:33:02 -06:00
rallytime
97cdaf003a Use assertCountEqual instead of assertItemsEqual for Python 3 2016-07-21 14:33:02 -06:00
rallytime
de6b2658d0 Remove test that isn't testing anything 2016-07-21 14:33:02 -06:00
rallytime
ad4f204cb2 readPlistFromString isn't included in plistlib for Python 3 
Use 'loads' instead.
 2016-07-21 14:33:02 -06:00
rallytime
f746fbf9cb Don't assert against lists in Python 3 - those are converted to views 2016-07-21 14:33:02 -06:00
rallytime
7cc438754d Use assertCountEqual in Python 3 to handle unsorted list returns 
Fixes the cassandra execution module unit tests
 2016-07-21 14:33:02 -06:00
Mike Place
d85aca1f7a Merge branch 'develop' into int_tests_interfaces 2016-07-21 12:26:21 -06:00
rallytime
1a9d6eee15 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/state.py
  - tests/unit/grains/core_test.py
 2016-07-21 12:06:25 -06:00
rallytime
15b4f5a8b3 Skip GCE unit tests - causes test suite to hang 2016-07-21 10:53:00 -06:00
Daniel Wallace
d2341654ea [PY3] actually test with nodegroup_comp function 2016-07-20 17:06:35 -05:00
Daniel Wallace
1e3429a3a2 [PY3] skip mysql tests 
mysql-python is not compatible with python3 yet.
 2016-07-20 17:05:49 -05:00
Mike Place
ec8a6ebab3 Correct config test errors 2016-07-20 10:00:31 -06:00
Mike Place
62ef8fdb35 Merge pull request #34670 from isbm/isbm-osmajorrelease-grain-suse 
Add "osmajorrelease" grain (2016.3)
 2016-07-20 08:39:38 -06:00
Mike Place
aff29906fc Merge pull request #34671 from isbm/isbm-osmajorrelease-grain-suse-devel 
Add "osmajorrelease" grain
 2016-07-20 08:35:34 -06:00
Mike Place
b986c35a88 Merge pull request #34794 from rallytime/reneable-pam-test 
Renable the pam execution module unit test
 2016-07-20 08:05:50 -06:00
Mike Place
b7fe952427 Remove test for file dir behavior 
Refs #34809
 2016-07-20 08:04:00 -06:00
rallytime
d68b60bff8 Renable the pam execution module unit test 
The logic wasn't correct on the skipIF. We want these test to run
when sys.platform.startswith('OpenBSD') is False.
 2016-07-19 16:15:12 -06:00
Mike Place
8b3b2cfe69 Merge pull request #34268 from DSRCompany/features/23194_publisher_acl_globing 
Regex support in publisher ACL rules.
 2016-07-19 15:37:06 -06:00
rallytime
7b0ad25b09 Remove iteritems() references from unit/transport/*.py files 2016-07-19 10:22:33 -06:00
rallytime
0ad8183973 Remove iteritems() references from unit/modules/*.py 2016-07-19 10:18:26 -06:00
Bo Maryniuk
038d2c3087 Fix group-add tests for SUSE 2016-07-19 18:01:37 +02:00
Bo Maryniuk
110a422d5a Keep osmajorrelease as a string type for 2016.3 release 2016-07-19 17:52:08 +02:00
Mike Place
10a1af9949 Remove unnedeed config test (#34751) 
Refs #34607
 2016-07-18 13:00:47 -06:00
rallytime
0baf92a972 Remove tests that were deleted in develop already 2016-07-18 11:14:21 -06:00
rallytime
d679c09e65 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/utils/parsers.py
  - tests/unit/config/config_test.py
 2016-07-18 10:34:03 -06:00
Dmitry Kuzmenko
27017e34ce Regex support in publisher ACL rules. 
Users in publisher ACL and users and functions in the publisher ACL
blacklist now have matched in the following order:
1. Equality
2. Glob
3. Regex

Users in publisher ACL still not supported in systems without pwd python
module (Windows, any else?)
 2016-07-18 19:15:28 +03:00
Bo Maryniuk
3cb6940904 Bugfix: access 'osmajorrelease' as an integer value 2016-07-18 17:14:57 +02:00
Mike Place
4625ee65b8 Remove unnedeed config test 
Refs #34607
 2016-07-18 09:12:18 -06:00
Nicole Thomas
2a3df50223 Merge pull request #34724 from rallytime/test-fix-34270 
Update mock value to match change in #34270.
 2016-07-16 14:06:04 -06:00
rallytime
f667b936e5 Update mock value to match change in #34270. 
Fixes the failing test in #34270
 2016-07-16 14:03:37 -06:00
Mike Place
1b3742c41b Merge pull request #34599 from meaksh/salt-snapper-module 
Snapper execution module and state for Salt
 2016-07-16 13:43:06 -06:00
rallytime
cca9446c37 Various spelling fixes 
Fixes #34630
 2016-07-16 13:17:09 -06:00
Mike Place
e918aba3c3 Merge pull request #34704 from babilen/influxdb-current 
Influxdb current
 2016-07-16 12:39:22 -06:00
Wolodja Wentland
87b54170aa Rename InfluxDB states and modules for 0.8 
InfluxDB versions newer than 0.8 introduced significant changes in
database concepts, user administration and Python API.

We therefore decided to rename the old InfluxDB states to 'influxdb08*'
and to reserve the 'influxdb' name for InfluxDB 0.9+ compatible states
and modules.
 2016-07-16 09:46:44 +02:00
Mike Place
b11fd8ef6a Merge pull request #34484 from dmacvicar/docker_images 
[WIP] Creating Docker images with pure Salt and running Salt commands inside containers
 2016-07-15 16:17:59 -06:00
Bo Maryniuk
e5c3195fa3 Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:14:27 +02:00
Bo Maryniuk
96021e257c Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:13:58 +02:00
Bo Maryniuk
5ed5142fbc Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:12:03 +02:00
rallytime
bb2c43b52a Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-14 14:10:10 -06:00
Bo Maryniuk
2040c7caa5 Add unit test for osmajorrelease grain 2016-07-14 18:08:15 +02:00
Bo Maryniuk
208fd33b48 Add unit test for osmajorrelease grain 2016-07-14 18:05:12 +02:00
Mike Place
eadae09e0a Merge pull request #34563 from rallytime/py3-state-unit-tests 
Py3 fixes for running unit tests in the unit/states/ directory.
 2016-07-14 08:28:49 -06:00
Anthony Shaw
7786c0020c Libcloud DNS module fix (#34628) 
* add test module

* add broken test

* fix typo in config dictionary

* remove call to unused function, add called_with assertion
 2016-07-13 11:47:20 -04:00
Anthony Shaw
4c61769024 add test module 2016-07-13 13:46:04 +10:00
Justin Anderson
445f8afc69 Fixes failing test on Suse Leap (#34621) 2016-07-12 18:48:06 -04:00