Commit Graph

2481 Commits

Author SHA1 Message Date
Justin Findlay
3a97818458 modules.parallels.delete: allow multiple IDs for same name
When parallels creates linked clones, it generates a new snapshot on the
cloned VM with the name 'Snapshot for linked clone', which when used
with jenkins results in hundreds of unneeded snapshots per week.
2016-09-08 14:22:26 -06:00
Pablo Suárez Hernández
235d6308a4 Fixing unit tests for develop (#36141)
* Fixing skipped boto tests to prevent errors if boto3 does not exists.

* Fix tests to prevent errors when libcloud is not present

* Fix PortageConfigTestCase in case of portage is not present
2016-09-08 11:15:41 -06:00
Eric Radman
158bcbff65 Fix tests that assert CommandExecutionError (#32485)
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
2016-09-08 12:39:28 +01:00
Mihai Dincă
8b480167e1 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-09-08 12:39:28 +01:00
Pablo Suárez Hernández
d1d806f893 Fix PortageConfigTestCase in case of portage is not present 2016-09-08 12:39:28 +01:00
Eric Radman
c65aefee20 Fix tests that assert CommandExecutionError (#32485)
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
2016-09-08 11:36:17 +01:00
twangboy
f8c0b439b8 Fixed more lint 2016-09-08 11:36:17 +01:00
twangboy
63ff731009 Fixed tests 2016-09-08 11:36:17 +01:00
Dmitry Kuzmenko
04b1a4a9ca Fixed use of assert_has_calls in tests.
The method logic was changed in mock-1.1.0.
This mades the use of the method compatible with both <1.1.0 and >=1.1.0
2016-09-08 11:36:17 +01:00
Eric Radman
b5ca02c867 Fix tests that assert CommandExecutionError (#32485)
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
2016-09-08 11:36:17 +01:00
Mihai Dincă
1fb6340fef 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-09-08 11:36:17 +01:00
Pablo Suárez Hernández
d1b9a4061e Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-08 11:36:17 +01:00
Mike Place
6216e1df8c Merge pull request #36050 from m03/add-initial-win_snmp-unit-tests
Add initial unit tests for win_snmp
2016-09-07 14:26:01 +09:00
Moe
3c264528fb Expand/improve win_iis_test tests (#36053)
* Expand win_iis_test tests

* Fix linting issue
2016-09-06 10:47:28 -06:00
mwinnett
d6d38aad9e Update versionadd tags 2016-09-06 09:22:55 -07:00
Pablo Suárez Hernández
71ebf2c8cd Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-06 12:41:56 +01:00
mwinnett
2b92c383f1 Add initial unit tests for win_snmp 2016-09-03 12:34:28 -07:00
Justin Findlay
430ec201d9 modules.parallels: add exists and state fcns 2016-09-02 15:48:03 -06:00
Justin Findlay
0f7d704eb6 modules.parallels: add clone and delete functions 2016-09-02 15:48:03 -06:00
Justin Findlay
9eb0f637e9 modules.parallels.list_vms: add template arg, update name arg 2016-09-02 15:40:56 -06:00
Justin Findlay
d913f2cbe7 modules.parallels: add prlsrvctl function 2016-09-02 15:40:56 -06:00
Nicole Thomas
03ebb59e5e Remove commented out skipIf lines in boto_vpc_test module (#36013)
If we're running these tests successfully now, then let's remove these lines.
2016-09-02 14:37:41 -06:00
rallytime
f8c9b8443f Pass in connection parameters to boto_vpc function calls
Otherwise we are not properly mocking this function call and the
tests fail when the `_conn3` function is called. (Any distro using
salt.utils.boto3 will fail here.)

We also need to protect the test class if the correct versions of
boto and moto are not installed on the test system.
2016-09-01 22:35:14 -06:00
Justin Anderson
40131b9c27 Groupadd test fix (#36002)
* Change osmajorrelease back to str in test_useradd

* Change osmajorrelease back to str in test_userdel

* Change osmajorrelease back to str in test_members
2016-09-01 15:40:15 -06:00
Aditya Kulkarni
50981f4f11 Add unit tests for VPC module (#35996) 2016-09-01 15:12:22 -06:00
Mike Place
beec674141 Skip one Snapper test on 2.6
There's a slight difference in the diff comparison but we should be
able to catch true failures here with 2.7.
2016-09-01 20:19:06 +09:00
Aditya Kulkarni
347b05abd0 Add test for cassandra_cql returner's ssl opts parsing (#35944) 2016-08-31 15:26:11 -06:00
Daniel Wallace
9bdb161eac Add Keystone v3 support (#35911)
* Openstack keystone V3 API support in keystone modules.

* Python3 compatibility unicode to six.text_type

* Return values of tests: test_user_absent, test_endpoint_absent,
test_role_absent, test_service_absent, test_tenant_absent

* Fixed tests states.test_role_present and states.service_present

* Fixed module tests (not all)

* These are the old tests and need to be rewritten anyway

* fix pylint error

* fix keystone state tests
2016-08-31 11:55:23 -06:00
Mike Place
f3334126b4 Lint IIS test 2016-08-30 22:50:36 +09:00
Mike Place
83cd956b7b Merge pull request #35845 from m03/dry-and-more-iis-unit-tests
Additional win_iis unit tests and DRY
2016-08-30 16:20:51 +09:00
Justin Anderson
e744b795d1 Make ddns_test happy with py3 and py26 (#35857)
* Make python3 and python26 happy

* Don't need both ways of nesting with statements

* No longer need pylint disable

* Lint fix

* take out the correct import
2016-08-29 16:33:54 -06:00
Mike Place
9aea24aa47 Fixed a bug in windows hostname settings when the hostname is longer than 15 chars (#35848)
- The previous implementation was limited to the 15 char limit for "Computernames" which would cause the state to always fail if the hostname was longer
2016-08-29 10:09:53 -06:00
mwinnett
f48ebd082f DRY, additional win_iis unit tests 2016-08-28 23:42:53 -07:00
Mike Place
51b304f4a8 Merge pull request #35757 from vutny/grains-filterby-wildcard
grains.filter_by: lookup_dict key could be a globing pattern
2016-08-29 12:23:05 +09:00
Mike Place
202d9adf2e Merge pull request #35778 from kraney/boto_cloudwatch_event
Boto cloudwatch event
2016-08-29 11:20:47 +09:00
Mike Place
f6b31be592 Lint 2016-08-29 10:18:52 +09:00
Tarjei Husøy
8d2d20903d Ensure ssh keys are decodable before inserting
Closes #35631.
2016-08-28 11:45:41 -07:00
David Boucha
822b0a0f33 Don't test for linux shells on Windows (#35743)
* Don't test for linux shells on Windows

* Don't force windows to be false

Salt didn't used to support runas on Windows.
Salt now supports runas on Windows. This line was causing the wrong code
paths to be followed.

* Skip test on windows because no VT on windows

* add missing closing paren
2016-08-26 12:52:39 -06: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
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
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
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
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
rallytime
b5e5eeecd0 Remove htpasswd unit test for deprecated function that doesn't test anything 2016-08-22 17:14:07 -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
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
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
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
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
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
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
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
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
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
Silviu Dicu
750fde2931 tests and remote_ip renamed to remoteip as per netsh 2016-08-12 08:01:14 -04: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
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
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
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
rallytime
f37255ed16 Move remaining blockdev func unit tests to disk unit tests and delete file 2016-08-10 16:32:14 -06:00
Mihai Dinca
867ead79e5 Add test for non-ascii pkg.info_installed 2016-08-10 17:34:26 +02: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