valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
79,072 Commits 24 Branches 182 Tags 341 MiB
be2c2fab3f
Commit Graph

2692 Commits

Author SHA1 Message Date
rallytime
ee8321eab1 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-14 15:18:22 -06:00
rallytime
95dbe1ade4 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/fileserver/__init__.py
  - setup.py
  - tests/integration/modules/git.py
 2016-09-14 09:15:29 -06:00
rallytime
f603757b55 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/mount_test.py
  - tests/unit/states/file_test.py
 2016-09-13 08:21:48 -06:00
Pablo Suárez Hernández
fdf40907b7 Some unit tests fixes (#36227) 
* Prevent tests failures if boto does not exists

* Prevent tests failure if /etc/fstab does not exists
 2016-09-12 11:43:12 -06:00
rallytime
87341ed30b Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-12 09:42:26 -06:00
Mike Place
5ddf0af23e Merge pull request #36166 from jfindlay/parallels 
modules.parallels.delete: allow multiple IDs for same name
 2016-09-12 08:00:56 +09:00
mwinnett
b9a98f551e Add win_pki unit tests 2016-09-10 23:31:08 -07:00
Eric Radman
16e46e36d9 pkg.install: enable OpenBSD branch and flavor specifications 
Support OpenBSD branch specification (%)

  ruby%2.3

As well as flavor specification (--)

  vim--gtk2

By default packages are installed using the base flavor and the stable
branch.

Also add unit tests for OpenBSD package management
 2016-09-09 11:42:10 -04:00
rallytime
2edfef33ae Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/scripts.py
  - salt/thorium/key.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
 2016-09-08 17:31:29 -06:00
rallytime
6da0fbbe96 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/linux_sysctl.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
  - tests/unit/modules/boto_iot_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_iot_test.py
  - tests/unit/utils/network.py
 2016-09-08 16:14:04 -06:00
Justin Findlay
ad9ce5b4bc modules.parallels: remove redundant state function 
function is redundant with status, which prlctl provides natively
 2016-09-08 14:22:59 -06:00
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
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
Morrie Winnett
04acb5657b Add initial win_iis unit tests 2016-08-09 01:25:43 -07: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
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
6714e8f386 Fix mock call in disk wipe test 2016-08-07 06:57:20 +09: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
Jeffrey 'jf' Lim
dd6ebed1d6 Refactor sys.list_functions 2016-08-03 15:15:47 +08: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
f7bfc5dd4a Don't run Windows tests on Linux 2016-08-03 01:53:27 +09: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
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
98aad37cd6 Merge pull request #35095 from eradman/localemod 
Properly mock localemod unit tests
 2016-08-01 11:26:21 -06: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
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
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
Johannes Scholz
775ea73578 fix unit tests 2016-07-26 19:46:14 +02: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
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
rallytime
74002ab9e7 Pylint fix 2016-07-22 09:13:33 -06: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
aff29906fc Merge pull request #34671 from isbm/isbm-osmajorrelease-grain-suse-devel 
Add "osmajorrelease" grain
 2016-07-20 08:35:34 -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
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
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
Bo Maryniuk
3cb6940904 Bugfix: access 'osmajorrelease' as an integer value 2016-07-18 17:14:57 +02: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
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
rallytime
49f40e9d99 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/topics/reactor/index.rst
  - tests/integration/__init__.py
 2016-07-12 16:13:56 -06:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
 2016-07-12 14:29:35 -06:00
Justin Anderson
7dd8035c62 Gate docker unit test to check for docker (#34591) 
* Gate docker unit test to check for docker

* Change skipIf to check if docker-py is installed, not version check
 2016-07-12 13:33:31 -04:00
Pablo Suárez Hernández
c00991bc1e Fix for pylint: W1699 2016-07-12 15:38:28 +01:00
Pablo Suárez Hernández
5213ddeab9 Fix in inline comments 2016-07-12 15:10:25 +01:00
Duncan Mac-Vicar P
b60f76b836 pylint: W1699(incompatible-py3-code) 2016-07-12 15:44:01 +02:00
Pablo Suárez Hernández
867bfbf353 Variable renaming. Pylint fixes 2016-07-12 14:03:52 +01:00
Duncan Mac-Vicar P
cfdb1c3928 typo 2016-07-12 14:38:22 +02:00
Duncan Mac-Vicar P
1f77336a1d test that fix /tmp is not used 2016-07-12 14:37:47 +02:00
Pablo Suárez Hernández
5c06e91417 pylint: some fixes 2016-07-12 12:24:04 +01:00
Pablo Suárez Hernández
39e8ff0f25 pylint fixes 2016-07-12 11:03:09 +01:00
Pablo Suárez Hernández
0a9dbfc33a unit test for snapper.diff with binary file 2016-07-12 09:02:31 +01:00
rallytime
9f5e275f2e When writing strings to tmp files, use bytes for Python 3 2016-07-11 16:07:35 -06:00
rallytime
e6f875cd62 Remove izip import from unit.modules.boto_apigateway_test.py 
Use six compatible version of zip instead
 2016-07-11 14:26:06 -06:00
Pablo Suárez Hernández
964d5cbf03 fix diff unit test while creating text file 2016-07-11 16:15:11 +01:00
Pablo Suarez Hernandez
f77551b883 more unit tests 2016-07-11 16:47:49 +02:00
rallytime
c539333924 Use six.moves.StringIO() 2016-07-08 09:30:58 -06:00
rallytime
1f4a75f268 Move StringIO import to use six for tests.unit.modules.zypper_test.py 2016-07-07 19:27:30 -06:00
Duncan Mac-Vicar P
59d8ce480e implement keyword arguments for dockerng.call 2016-07-06 14:11:17 +02:00
Duncan Mac-Vicar P
d3ee81c561 testcase for call 2016-07-06 11:49:39 +02:00
Bo Maryniuk
d1c2d5aaaa Lintfix 2016-07-06 10:09:14 +02:00
Bo Maryniuk
88ab5f4755 Fix Python3 compat (StringIO) 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f1d0961e69 Fix boolean comparison 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f275378e24 Add unit test for update an object 2016-07-06 10:09:14 +02:00
Bo Maryniuk
6174f4ad4a Fix imports 2016-07-06 10:09:14 +02:00
Bo Maryniuk
bf9ba65489 Add unit test for deleting objects 2016-07-06 10:09:14 +02:00
Bo Maryniuk
1ce88be0ef Add unit test for criteria matcher 2016-07-06 10:09:14 +02:00
Bo Maryniuk
a20019d859 Add unit test for "matches" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
844eefd758 Add unit test for "less than" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
fac88ac41b Add unit test for "equals" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
1dfe81bfe6 Add unit test for "more than" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
99848659c9 Add unit test on getting objects 2016-07-06 10:09:14 +02:00
Bo Maryniuk
bc1a8b7e45 Accept content in Writer 2016-07-06 10:09:14 +02:00
Bo Maryniuk
c4c2ac7e70 Add object storing unit test 2016-07-06 10:09:14 +02:00
Bo Maryniuk
8e537ccc9e Reset data in Writable 2016-07-06 10:09:14 +02:00
Bo Maryniuk
c744aa1caf Add unit test for database listing 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f7dc2b9c84 Add unit test for object validation 2016-07-06 10:09:14 +02:00
Bo Maryniuk
234e342aa7 Add unit test for object serialization 2016-07-06 10:09:14 +02:00
Bo Maryniuk
0a177297f4 Rename Writable class 2016-07-06 10:09:14 +02:00
Bo Maryniuk
8927d6fef6 Rename "TestEntity" as it accidentally picked by PyTest 2016-07-06 10:09:14 +02:00
Bo Maryniuk
4c7e4d36b7 Fix docstring 2016-07-06 10:09:14 +02:00
Bo Maryniuk
1df6b0a6a9 Add test creating table 2016-07-06 10:09:14 +02:00
Bo Maryniuk
54e5655e11 Add unit test for database close 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f9c40170e5 Add initial tests for fsdb 2016-07-06 10:09:14 +02:00
Bo Maryniuk
eff3f4ef66 Fix broken tests: add os.mkdir mocking 2016-07-06 10:09:14 +02:00
Bo Maryniuk
e85343df9b Add licence to the inspector collector unit test 2016-07-06 10:09:14 +02:00
Duncan Mac-Vicar P
4e7e72e9c4 test return value 2016-07-06 09:37:14 +02:00
Duncan Mac-Vicar P
8aadb33d44 first version of building docker images 2016-07-06 09:14:49 +02:00
Pablo Suarez Hernandez
dc4e51a040 some pylint fixes 2016-07-05 10:04:00 +02:00
Pablo Suarez Hernandez
dd3827e818 snapper module unit tests 2016-07-04 16:27:26 +01:00
Erik Johnson
20ed2c6bcf Remove repr formatting flag in places where it is used solely for quoting (#34183) 
* salt/cloud/__init__.py: remove repr formatting

* salt/cloud/clouds/azurearm.py: remove repr formatting

* salt/cloud/clouds/ec2.py: remove repr formatting

* salt/cloud/clouds/profitbricks.py: remove repr formatting

* salt/loader.py: remove repr formatting

* salt/modules/win_file.py: remove repr formatting

* salt/modules/zypper.py: remove repr formatting

* salt/pillar/consul_pillar.py: remove repr formatting

* salt/renderers/pyobjects.py: remove repr formatting

* salt/returners/sentry_return.py: remove repr formatting

* salt/states/bower.py: remove repr formatting

* salt/states/cabal.py: remove repr formatting

* salt/states/cmd.py: remove repr formatting

* salt/states/composer.py: remove repr formatting

* salt/states/win_network.py: remove repr formatting

* salt/states/eselect.py: remove repr formatting

* salt/states/file.py: remove repr formatting

* salt/states/htpasswd.py: remove repr formatting

* salt/states/memcached.py: remove repr formatting

* salt/states/npm.py: remove repr formatting

* salt/states/pip_state.py: remove repr formatting

* salt/states/pkg.py: remove repr formatting

* salt/states/pkgrepo.py: remove repr formatting

* salt/states/supervisord.py: remove repr formatting

* salt/states/timezone.py: remove repr formatting

* salt/states/virtualenv_mod.py: remove repr formatting

* salt/states/dockerio.py: remove repr formatting

* salt/states/win_system.py: remove repr formatting

* salt/utils/nb_popen.py: remove repr formatting

* salt/utils/cloud.py: remove repr formatting

* Add pylint disable due to legit usage of repr flag

See https://github.com/saltstack/salt-pylint/pull/6

* Fix composer tests

These tests needed to be updated because quoting was changed in the
state module in 9dc9146. There was an unnecessary !r used for the
exception class there, which means that instead of the exception class
being passed through the formatter and coming out with the equivalent
value of err.__str__(), we get a repr'ed instance of the exception class
(i.e.  SaltException('',)) in the state output.

The unit test was asserting that we have that repr'ed instance of
SaltException in the output, a case of writing the test to confirm the
badly-conceived output in the state. This has also been corrected.

* salt/cloud/clouds/azurearm.py: lint fixes

* salt/modules/boto_s3_bucket.py: lint fixes

* salt/modules/minion.py: lint fixes

* salt/modules/reg.py: lint fixes

* salt/modules/testinframod.py: lint fixes

* salt/modules/win_iis.py: lint fixes

* salt/pillar/csvpillar.py: lint fixes

* salt/utils/win_functions.py: lint fixes

* salt/states/nxos.py: lint fixes

* salt/returners/mongo_future_return.py: lint fixes

* tests/integration/__init__.py: lint fixes

* tests/unit/context_test.py: lint fixes

* tests/integration/states/file.py: lint fixes

* tests/integration/utils/test_reactor.py: lint fixes

* tests/integration/utils/testprogram.py: lint fixes

* tests/unit/__init__.py: lint fixes

* tests/integration/shell/minion.py: lint fixes

* tests/unit/modules/boto_apigateway_test.py: lint fixes

* tests/unit/modules/boto_cognitoidentity_test.py: lint fixes

* tests/unit/modules/boto_elasticsearch_domain_test.py: lint fixes

* tests/unit/modules/k8s_test.py: lint fixes

* tests/unit/modules/reg_win_test.py: lint fixes

* tests/unit/states/boto_apigateway_test.py: lint fixes

* tests/unit/states/boto_cognitoidentity_test.py: lint fixes

* tests/unit/states/boto_elasticsearch_domain_test.py: lint fixes
 2016-06-29 16:30:18 -04:00
rallytime
cc83fa151a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/status.py
  - salt/utils/__init__.py
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_vpc_test.py
 2016-06-28 17:34:27 -06:00
rallytime
c87a108a12 Don't forget the pylint disables for range 2016-06-28 16:52:37 -06:00
rallytime
359e8ca2ce Pylint fixes 2016-06-28 16:04:47 -06:00
Jorge Schrauwen
b8c6948cd5 fixes broken rm_fstab test due to missing __grain__.kernel 2016-06-25 15:42:15 +02:00
rallytime
c2b52ccf9c Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/ipset.py
 2016-06-24 16:03:11 -06:00
Jorge Schrauwen
c3667203bf add test for vfstab 2016-06-24 23:33:39 +02:00
Jorge Schrauwen
80e9d1d278 set __grains__ for fstab unit test 2016-06-24 23:28:53 +02:00
Jorge Schrauwen
a09055cba7 Fix for #14915 (#34254) 
* mount.swaps now works on solarish like systems

* mount.swapon / mount.swapoff supported on solarish platforms

* mount.active (and internal consumers) now work on all solarish platforms

* unit-tests - mount_tests should set kernel grain
 2016-06-24 10:32:48 -04:00
rallytime
8cec6f3fb4 Fixup test failure 2016-06-23 09:38:49 -06:00
rallytime
8479c45728 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-06-21 17:29:44 -06:00
rallytime
318c2ed6a1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/grains.py
  - tests/unit/modules/boto_vpc_test.py
 2016-06-21 16:03:31 -06:00
rallytime
8e36e90966 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
 2016-06-21 14:47:23 -06:00
Thomas S Hatch
3dbf7119ce Merge pull request #34088 from Unity-Technologies/osx/mac_defaults_absent 
Osx/mac defaults absent
 2016-06-20 13:30:40 -06:00
Justin Anderson
b7ac6c735a Moved imports to top, out of _get_moto_version function 2016-06-20 13:20:43 -06:00
Justin Anderson
02f9ba99ba Updated version check. Moved check into it's own function 2016-06-20 10:33:13 -06:00
Justin Anderson
d445026c56 Updated test to work with new moto version. Changed strings to unicode 2016-06-20 09:26:39 -06:00
rallytime
0f92f3420d Change 'Suse' to 'SUSE' in inspect_collector_test 
This is needed due to the change in #33564
 2016-06-17 10:56:42 -06:00
Daniel Hobley
182373344e Moved to using run_all in the absent function 
- Fixed unit tests
 2016-06-17 16:13:38 +02:00
joelc
ec31f7a7d4 Adds delete functionality to mac_defaults 2016-06-17 08:25:42 -05:00
rallytime
d957c29704 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/master.py
  - salt/utils/parsers.py
 2016-06-16 17:08:39 -06:00
Thomas S Hatch
73ff11585e Merge pull request #33987 from isbm/isbm-inspectlib-cleanup 
inspectlib cleanup
 2016-06-15 16:09:31 -06:00
Bo Maryniuk
fe300ccf73 Lintfix 2016-06-14 09:39:04 +02:00
Bo Maryniuk
96423076b1 Add unit test for file tree 2016-06-14 00:25:08 +02:00
Bo Maryniuk
8975036b27 Add get_unmanaged_files test 2016-06-14 00:05:34 +02:00
rallytime
c57bcebaf8 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/boto_lambda.py
 2016-06-13 11:18:53 -06:00
Bo Maryniuk
be5f12fcaf Add initial unit test for inspectlib.collector.Inspector 2016-06-13 18:17:28 +02:00
rallytime
b4ab322ce1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/saltutil.py
 2016-06-10 13:41:53 -06:00
rallytime
f078d57b57 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/modules/win_servermanager.py
  - salt/state.py
  - salt/states/boto_s3_bucket.py
  - salt/states/pip_state.py
  - salt/states/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
  - tests/unit/states/dockerng_test.py
 2016-06-09 13:06:10 -06:00
Nicole Thomas
08a584b3e5 Merge pull request #33711 from rallytime/merge-develop-3 
[develop] Merge forward from 2016.3 to develop
 2016-06-09 14:12:48 -04:00
Justin Findlay
82f95429db modules.random_org unit tests: skip if random.org down 2016-06-08 20:46:20 -06:00
rallytime
595d4f2ac3 Fixup new groupadd tests for syntax change in 2016.3 2016-06-08 12:42:52 -06:00
rallytime
c5b4ec0b0f Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/groupadd.py
  - salt/states/service.py
 2016-06-08 11:20:18 -06:00
Mike Place
f7b3d0eda0 Merge pull request #33839 from cachedout/fix_pkgresource_test_stacktrace 
Fix another unit test stacktrace in pkg_resource
 2016-06-08 06:32:55 -07:00
Mike Place
5f081ef31c Merge pull request #33840 from cachedout/remove_matcher_unit_tests 
Remove matcher tests
 2016-06-08 06:31:41 -07:00
Mike Place
6297448377 Remove matcher tests 
These all assert directly against mock objects. They're pointless.
 2016-06-07 16:36:01 -06:00
Mike Place
435547a747 Fix another unit test stacktrace in pkg_resource 2016-06-07 15:55:52 -06:00
Mike Place
453fb1ac91 Fixing more stupid unit tests 
This time win_servermanager
 2016-06-07 15:33:12 -06:00
twangboy
9be45fe37a Fix some more lint 2016-06-07 13:17:29 -06:00
twangboy
8d66fac74c Add missing unit tests 2016-06-07 09:53:22 -06:00
twangboy
60f856f73d Fix unit tests for module 2016-06-06 18:33:29 -06:00
Mike Place
11e39e7203 Merge pull request #33712 from meaksh/fix-for-groupadd-module-failures-in-SLE11-2015.8 
Fix for groupadd execution module failures in SLES11 systems
 2016-06-03 09:13:06 -07:00
Pablo Suárez Hernández
ab738416ba pylint fix 2016-06-03 13:57:13 +01:00
Pablo Suárez Hernández
bf27e5d36e test_members cleanup 2016-06-03 13:25:05 +01:00
Pablo Suárez Hernández
ba815dbf76 improvements on groupadd unit tests 2016-06-03 13:17:13 +01:00
Mike Place
64c7dd7032 Merge pull request #33626 from evonzee/feature/issue-15749 
Feature/issue 15749
 2016-06-02 11:23:36 -07:00
rallytime
9220ea0729 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/minion.py
  - salt/modules/mac_brew.py
  - salt/modules/pkgng.py
  - salt/states/apache_module.py
  - salt/states/ini_manage.py
  - salt/states/win_servermanager.py
 2016-06-02 10:13:34 -04:00
rallytime
b7accb0b3b Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/utils/aws.py
  - salt/utils/s3.py
 2016-06-02 10:01:43 -04:00
twangboy
6c7b21676a Fix lint and tests 2016-06-01 17:10:55 -06:00
Mike Place
5e022ff29c Merge pull request #33581 from dincamihai/2015.8 
Call zypper refresh after adding/modifying a repository
 2016-06-01 15:25:11 -07:00
Pablo Suárez Hernández
f9b6858cf9 unit tests for udev execution module 
tests improvements
 2016-06-01 12:23:30 +01:00
rallytime
cd05d2bed1 Fix zypper test 2016-05-31 13:43:09 -04:00
Nicole Thomas
74a7b78e00 Merge branch '2015.8' into '2016.3' 
Conflicts:
  -   -   -   -   -   -   -   -   - doc/conf.py
 2016-05-31 11:02:20 -04:00
eric vz
c4f9de2d24 fix broken pacman module tests 2016-05-31 08:17:33 -05:00
eric vz
b49f9d5a19 one last, sad piece of lint 2016-05-31 01:03:15 -05:00
eric vz
7e0f1c0841 Fix (hopefully) the last linter issues 2016-05-31 00:34:13 -05:00
eric vz
803f219160 Clean up linter warnings 2016-05-31 00:07:31 -05:00
eric vz
bf25b8118e switch pacman.group_info to return an array instead of a set so it's useful on command line 2016-05-30 23:08:59 -05:00
eric vz
94c6378c6e Implement group_diff for pacman 2016-05-30 16:56:53 -05:00
eric vz
e89a43d1d0 Implement a basic group_info 2016-05-30 16:39:16 -05:00
eric vz
fa2fe986e6 Add pacman group_list and unit test 2016-05-30 15:33:59 -05:00
eric vz
595beadda7 formatting 2016-05-30 14:13:56 -05:00
eric vz
9e6013c4b7 move helper into a lambda 2016-05-30 14:13:36 -05:00
eric vz
0179d4d849 Add unit tests for pacman list packages 2016-05-30 09:37:17 -05:00
Mihai Dinca
788730ea72 DRY test 2016-05-30 13:52:46 +02:00
Mihai Dinca
1d3769ccfa Improve zypper_patcher_config looks 2016-05-30 13:52:45 +02:00
Mihai Dinca
42d8d4195c Assert only gpgautoimport: True works 2016-05-30 13:51:54 +02:00
Mihai Dinca
80bfbe5c52 Reduce dicts and lists to one line where possible 2016-05-30 10:47:41 +02:00
Mihai Dinca
1d5d6d7d60 Update test method names to pass pylint 2016-05-30 10:05:07 +02:00
Dan Slimmon
180099ae9f Wrote test for broken server connection 2016-05-30 03:23:18 +00:00
anthony-shaw
83461e0940
fixes for docs in servicenow module and more tests 2016-05-29 21:03:33 +10:00
Mihai Dinca
c7ae5907ee Call zypper refresh after adding/modifying a repository 
Calling `zypper --gpg-auto-import-keys refresh` is required after
adding/modifying a repository because `--gpg-auto-import-keys` doesn't
do anything when called with `zypper ar` or `zypper mr`.
Without calling `zypper --gpg-auto-import-keys refresh` here, calling
`zypper ref` after adding/removing would still ask for
accepting/rejecting the gpg key.
 2016-05-27 16:17:10 +02:00
Pablo Suárez Hernández
eaaef25c79 lint issue fixed 2016-05-26 08:26:24 +01:00
Justin Findlay
2781377b17 modules.mac_brew: update unit tests 2016-05-25 22:15:12 -06:00
rallytime
a5e0141eda Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/beacons/__init__.py
  - salt/modules/saltutil.py
  - salt/modules/zypper.py
  - salt/states/grains.py
  - salt/states/pkgrepo.py
  - salt/states/service.py
 2016-05-25 13:44:21 -06:00