Commit Graph

2414 Commits

Author SHA1 Message Date
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
mwinnett
2b92c383f1 Add initial unit tests for win_snmp 2016-09-03 12:34:28 -07: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