Commit Graph

2821 Commits

Author SHA1 Message Date
Alexandru Bleotu
4b11697d40 Added tests for modules.vsphere.get_service_instance_via_proxy 2017-01-13 12:10:20 +00:00
rallytime
6a14ddeaef [vsphere_test.py] Exception.message has been removed in Python 3
Access the message from the Exception('exception message',) object.
2017-01-12 15:21:56 -07:00
Ch3LL
47f8b68e0b fix unit.modules.file_test 2017-01-09 15:01:52 -07:00
rallytime
7a668e9749 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/pillar.py
2017-01-09 11:59:43 -07:00
Jonathan Ballet
2c8845aaa0 add test for pillar.get() + default value 2017-01-06 10:20:13 -05:00
Jonathan Ballet
c2f98d2f04 ticket 38558: add unit test, deepcopy() only if necessary 2017-01-06 10:19:57 -05:00
zwo-bot
9fadb13524 Fix #38558 - pillar.get with default= ...,merge=true influence subsequent calls of pillar.get (#38579)
* added deepcopy of default if merge=True

* ticket 38558: add unit test, deepcopy() only if necessary

* add test for pillar.get() + default value
2017-01-06 10:10:19 -05:00
rallytime
c47f34f535 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/modules/chocolatey.py
  - salt/modules/htpasswd.py
  - salt/modules/img.py
  - salt/modules/smartos_virt.py
  - salt/modules/virtualenv_mod.py
  - salt/modules/xapi.py
  - salt/modules/zypper.py
  - salt/state.py
2017-01-04 15:34:41 -05:00
Mike Place
1895eb7533 Merge pull request #38529 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-01-04 10:06:56 -07:00
Pablo Suárez Hernández
68d5475c1f Fixing Snapper unit tests for SUBVOLUME support 2017-01-04 08:59:51 +00:00
rallytime
9ad362fbde Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/states/kapacitor.py
2017-01-03 10:17:18 -05:00
rallytime
85f470207c Merge branch '2016.3' into '2016.11'
No conflicts.
2017-01-03 10:13:06 -05:00
Daniel Wallace
048b9f6b9d add test 2016-12-29 17:08:24 -06:00
James Payor
d905c0730e Fixes for the behaviour of rabbitmq list_* module functions (all return lists/dicts as appropriate now). Fix bug in plugin_is_enabled and add list_{available, enabled}_plugins. 2016-12-29 19:40:07 +11:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
Daniel Wallace
7b7c6b3878 file.line fail with mode=delete
If the file is empty, it also fails, fix that.
2016-12-28 11:51:45 -06:00
Mike Place
34621930aa Merge pull request #38420 from rallytime/module-deprecations
Removed various deprecation notices from salt/modules/* files
2016-12-27 09:09:58 -07:00
rallytime
a2927226ea Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/modules/all/salt.modules.napalm_route.rst
  - doc/ref/modules/all/salt.modules.napalm_snmp.rst
  - doc/ref/modules/all/salt.modules.napalm_users.rst
  - doc/ref/states/all/salt.states.netsnmp.rst
  - doc/ref/states/all/salt.states.netusers.rst
  - salt/states/cron.py
2016-12-22 12:15:06 -07:00
rallytime
0a27f941f7 Removed various deprecation notices from salt/modules/* files
Added docs to the release notes for all of these changes.

The affected modules are:

- htpasswd
- img
- smartos_virt
- virt
- virtualenc_mod
- xapi
- zypper
2016-12-22 11:57:26 -07:00
George Macon
dca24b270e Use --all when calling pip.py
Fixes #38253.
2016-12-20 11:48:00 -05:00
rallytime
8f80916432 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/topics/cloud/index.rst
  - salt/states/cron.py
2016-12-19 14:00:52 -07:00
Mike Place
86c53b8efd Merge pull request #38172 from rallytime/win-deprecations
Remove support for deprecation options/functions in win* files
2016-12-19 07:33:05 -07:00
Adam Mendlik
8bfcd5bcd5 Adjust alternatives test for updated error message 2016-12-18 10:04:24 -07:00
Oleksandr Porunov
786cb5412e Change assertTrue to assertFalse in tests 2016-12-16 15:40:20 +02:00
Oleksandr Porunov
0e7f35e7b8 Change s3 tests. Add additional checks into the s3 module 2016-12-16 10:29:09 +02:00
rallytime
a9f90b881a Remove suport for the "win_repo", "win_repo_mastercachefile", and "win_gitrepos" options
The "winrepo_dir", "winrepo_cachefile", and "winrepo_remotes"  options should be used instead,
respectively.
2016-12-15 13:14:47 -07:00
Arthur Wikström
23d69c4ffe Updated expected test results for mac_package 2016-12-14 14:11:49 +01:00
rallytime
fe1e24909e Merge branch '2016.11' into 'develop'
No conflicts.
2016-12-13 11:29:16 -07:00
rallytime
6a327d1367 Merge branch '2016.3' into '2016.11'
No conflicts.
2016-12-13 10:19:47 -07:00
Mike Place
8f5c6e5df9 Merge pull request #38180 from alexbleotu/vsphere_decorators-gh
Vsphere decorators gh
2016-12-13 00:43:51 -07:00
rallytime
bdb807fc7c Skip test_cert_info tls unit test on pyOpenSSL upstream errors
The 16.0.0 version of pyOpenSSL has an upstream error in it that
causes a stacktrace in our test suite. The upstream issue has
been fixed in pyOpenSSL in 16.1.0 and upwards, but 16.0.0 is still
available.

This fix skips the test when the specific error generated by the
upstream bug is encountered during the test.
2016-12-12 14:21:41 -07:00
rallytime
29f45c192c Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/cloud/clouds/ec2.py
  - salt/modules/grains.py
2016-12-12 11:23:57 -07:00
Alexandru Bleotu
ded7ff9adb Fixed pylint 2016-12-12 05:56:13 -05:00
Mike Place
8355adc535 Merge pull request #38158 from cachedout/issue_38094
Fix type problem in grains.filter_by
2016-12-09 14:24:40 -07:00
Mike Place
e8196e23c2
Lint, remove set literal 2016-12-09 11:37:44 -07:00
Alexandru Bleotu
bef16be61d Removed unnecessary call to salt.modules.vsphere._get_proxy_target from test 2016-12-09 11:58:00 -05:00
Alexandru Bleotu
a7f250b7a0 Added tests for modules.vsphere.test_vcenter_connection 2016-12-09 07:55:44 -05:00
Alexandru Bleotu
cd47cf754c Added tests for modules.vsphere.gets_service_instance_via_proxy decorator 2016-12-09 07:55:44 -05:00
Alexandru Bleotu
f94ead0ad3 Added tests for modules.vsphere.supports_proxies decorator 2016-12-09 07:55:43 -05:00
Alexandru Bleotu
c9e70743d3 Added tests for modules.vsphere._get_proxy_connection_details 2016-12-09 07:55:43 -05:00
Alexandru Bleotu
7edf6101c1 Added tests for modules.vsphere.get_proxy_type 2016-12-09 07:55:30 -05:00
Alexandru Bleotu
1f0bdf83e9 Updated authors of tests for modules.vsphere 2016-12-09 07:55:30 -05:00
rallytime
4998b8d116 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/peer.rst
  - doc/topics/reactor/index.rst
2016-12-07 16:31:11 -07:00
Mike Place
9f4ebb3c18
Fix type problem in grains.filter_by
Closes #38094
2016-12-07 11:25:19 -07:00
Nicole Thomas
ae754e1069 Mock config.option call return for iptables unit test (#38131)
Refs #31662
2016-12-07 11:19:46 -07:00
Mike Place
fd06bab673 Merge pull request #38043 from MTecknology/2016.11
Debian networking fix
2016-12-07 10:32:17 -07:00
rallytime
d513a60189 Do not allow libcloud to be injected as a mock value in the libcloud_dns_test
Other tests rely on importing libcloud, which should
not be a mock value.
2016-12-05 16:55:18 -07:00
Michael Lustfield
82d2b89e0c Rolling back unit test.
Sorry, I just don't have the time to learn all of this right now.
2016-12-02 20:26:00 -06:00
Michael Lustfield
b3edbcfd05 Adding larger and more complete debian_ip unit test. 2016-12-02 18:59:27 -06:00
Michael Lustfield
b6b1adc091 Typo: missing closing parenthesis 2016-12-02 14:57:12 -06:00
Michael Lustfield
32a1374748 Corrects expected return value
Tests were failing because _parse_interfaces is returning the correct data per mocked data. The assertion was expecting the iface line to have been stripped.
2016-12-02 13:34:31 -06:00
Mike Place
faf94a10a0 Merge pull request #38030 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2016-12-01 15:03:32 -07:00
Erik Johnson
ac2f4e3ab9 Update systemd module unit tests to reflect new masking behavior 2016-12-01 14:21:33 -06:00
rallytime
0eab0ee8a6 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/topics/releases/2016.11.0.rst
2016-12-01 12:14:33 -07:00
Daniel Wallace
9caf0b406d use sleep from path for docker.sls_build
sleep sometimes is found in /bin/sleep, like in ubuntu.  We should just
depend on the PATH variable being correct, and finding sleep, instead of
explicitly saying /usr/bin/sleep
2016-11-30 10:17:30 -06:00
Mike Place
c8380cf2c9 Merge pull request #37953 from m03/another-set-of-aptpkg-tests
Additional aptpkg module unit tests
2016-11-30 09:02:21 -07:00
m03
8d5ce68b55 Address config.get in autoremove and upgrade 2016-11-29 12:48:02 -08:00
m03
001d1b615f Additional aptpkg module unit tests 2016-11-29 08:18:08 -08:00
Mike Place
c25a306759 Merge pull request #37647 from americanexpress/cron-non-root
Revising cron for OS agnostic support of cron when running non-root
2016-11-29 07:33:48 -07:00
Mike Place
9cab761320 Merge pull request #37909 from thusoy/invalid-timezone
Throw error when setting invalid timezone
2016-11-28 14:04:35 -07:00
rallytime
dfedd1185a Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/grains/core.py
  - salt/modules/ddns.py
  - salt/templates/rh_ip/network.jinja
2016-11-28 11:08:19 -07:00
Tarjei Husøy
316d581354 Throw error when setting invalid timezone
Closes #37685.
2016-11-28 09:21:52 -08:00
m03
2aeaf553c8 Add tests 2016-11-28 07:33:01 -08:00
rallytime
3dfed6b841 Adjust linux_acl unit test argument ordering 2016-11-23 17:02:23 +00:00
Moe
40af1857be Add more aptpkg unit tests (#37793)
* Add more aptpkg unit tests

* Add test_refresh_db
2016-11-21 09:19:42 -07:00
Benjamin J Cane
27c532b34c Adding spacing for pylint 2016-11-18 16:26:54 -07:00
Benjamin J Cane
16222e1d05 Revising logic to account for cron.deny 2016-11-18 15:46:57 -07:00
Benjamin J Cane
8c84fd2013 Merge remote-tracking branch 'salt-upstream/develop' into cron-non-root 2016-11-17 15:40:42 -07:00
m03
8cb794addb Add initial aptpkg unit tests 2016-11-13 09:10:37 -08:00
Benjamin J Cane
61afd6e69f Revising for PEP8 checks 2016-11-11 14:11:16 -07:00
Benjamin J Cane
cf7585c9ab Removing blank line for PEP compliance 2016-11-11 13:08:10 -07:00
Benjamin J Cane
e188e12bc9 Fixing merge conflict with latest from develop 2016-11-11 12:21:27 -07:00
Benjamin J Cane
405c3336aa Revising cron state & module for OS agnostic support of cron when running as non-rootSquashed commit of the following:
commit d5003a44230f7bb6878057023726ba7135c9909c
Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
Date:   Fri Nov 11 10:22:21 2016 -0700

    Revising cron state & module for OS agnostic support of cron when running as non-root

    commit c9c20fc34670e1b371c505d8b7959ea00ae0a36e
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Thu Nov 10 15:47:04 2016 -0700

        Re-adding removed comment

    commit 4058bf3f609aeec11e0ff2a91191eba16556abf0
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Mon Nov 7 11:08:20 2016 -0700

        Adding user to error message and fixing key error if there is no updates

    commit 768e28e43585451a241979d048d5ac704f4f8f60
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Fri Nov 4 23:24:13 2016 -0700

        Added try/except on group identification and refactored success messaging

    commit d575189b17c1b75ef6d43b9ca821fb66aa142531
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Fri Nov 4 23:23:38 2016 -0700

        Added try/except on group identification and refactored success messaging

    commit 13a8207e5bc99044a3dfca4412e34ba9884d44a8
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Fri Nov 4 17:21:18 2016 -0700

        Resolving group permissions issues when managing non-root crontabs

    commit 89a7d1e04f21f1cbd93b83052cf47ba7a7225d72
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Fri Nov 4 12:32:55 2016 -0700

        Adding unit tests for OS specific cron command string rules

    commit b2a00009fda987474c40cee3f2ed8affe5f07f5b
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Wed Nov 2 09:10:06 2016 -0700

        Fixing cron.file when running as non-root

    commit ba27b18b01f304e541af8b6c7107596f34651123
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Fri Oct 28 10:58:03 2016 -0700

        Removed OS specific logic to always run crontab commands as owner of cron
2016-11-11 10:36:48 -07:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
2016-11-10 15:59:51 -07:00
Mike Place
403b469aea Merge pull request #37601 from eradman/random_org
Skip random.org tests for any communication failure
2016-11-11 10:52:25 +13:00
Eric Radman
671cebfa30 Skip random.org tests for any communication failure
This test connects to random.org, which may throws the following error
on one network I manage:

ssl.SSLError: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:590)

Other errors are possible, such as `socket.error`.  Since it is
difficult to anticipate the failure mode, skip these tests if https
communication provokes any exception.

Also, this is not a unit test--it's more of a system test. My
recommendation that we recategorize this as an integration test where
global IPv4 routing can more reasonably expected.
2016-11-10 07:48:24 -05:00
Eric Radman
b19440418d Fixes to unit tests (#37586)
Add skipIf pyvmomi is not installed

    NameError: global name 'vmodl' is not defined
    NameError: global name 'vim' is not defined

Fix skipIf typo for OpenBSD

    >>> import sys
    >>> sys.platform
    'openbsd6'

Avoid warning from glusterfs.py:

    Use specific 'len(elem)' or 'elem is not None' test

Enable boto_secgroup_test tests that work now:

    test skipped due to error in moto return - fixed in
    cc01669643
2016-11-09 13:58:08 -07:00
rallytime
f44e14b63c Merge branch 'carbon' into '2016.11'
Conflicts:
  - salt/modules/file.py
2016-11-09 12:56:58 -07:00
Nicole Thomas
2e8e56ca69 [PY3] Change log.warn statements to log.warning (#37531)
* [PY3] Change log.warn statements to log.warning

log.warn is deprecated in Python 3. This change removes the
occurance of deprecation warnings for using log.warn. For example:

```
17:24:23 [WARNING ] /testing/salt/utils/verify.py:522: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead
17:24:23   log.warn('Insecure logging configuration detected! Sensitive data may be logged.')
17:24:23
17:24:23 [WARNING ] Insecure logging configuration detected! Sensitive data may be logged.
```

* Tweak unit.utils.verify_test to using warning instead of warn
2016-11-08 13:06:54 -07:00
rallytime
5ead1425d7 Merge branch '2016.3' into 'carbon'
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/win_servermanager.py
2016-11-08 13:04:33 -07:00
Nicole Thomas
453319b50a Don't pass the vpc id to boto.vpc.create_internet_gateway func (#37556)
That function's namespace looks like this:
```
def create_internet_gateway(self, dry_run=False):
```
So when we pass in the vpc_id opbject in the test, the check later
in the function sets `dry_run=True` since the vpc_id opbject exists.

This later throws JSONResponseErrors because the `DryRun` flag is
set. This error raising functionality was added in the most recent
version of moto, which exposed this bug.

This fixes the three boto_vpc_test unit state tests. We'll see if
other tests need to be addressed in other files on a full test run.
2016-11-08 12:48:26 -07:00
rallytime
2e68da3e52 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/topics/cloud/vmware.rst
  - salt/cloud/clouds/vmware.py
2016-11-07 08:22:17 -07:00
rallytime
3b56f8bce1 Merge branch '2016.3' into 'carbon'
Conflicts:
  - doc/topics/event/master_events.rst
2016-11-07 08:13:57 -07:00
Mike Place
be93710fee Merge pull request #37452 from rallytime/fix-31135
file.line with mode=replace on an empty file should return False, not stacktrace
2016-11-06 14:55:11 +13:00
Mike Place
9e4e936f4f Merge pull request #37473 from m03/fix-167-logrotate-state_2
Fix #167 - Add logrotate state module
2016-11-06 14:45:15 +13:00
rallytime
ce4b82fdee Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/modules/archive.py
  - salt/modules/status.py
  - salt/states/file.py
  - tests/unit/modules/status_test.py
2016-11-04 13:51:46 -06:00
rallytime
4132929832 Merge branch 'carbon' into '2016.11'
No conflicts.
2016-11-04 13:38:34 -06:00
m03
466efd3f55 Change test str to int for consistency 2016-11-04 09:43:02 -07:00
Erik Johnson
a3f38e5a9f Update file.extract_hash unit tests
These tests now not only test the new functionality added for matching
on source URI and source_hash_name, but also test non-specific hash_type
lookups, specific hash_type lookups, and failed specific hash_type
lookups (i.e. requesting a hash type not present in the file).
2016-11-04 11:25:54 -05:00
Pablo Suárez Hernández
4ae036055d Fix unit test for Zypper dist-upgrade in Carbon 2016-11-04 09:36:41 -06:00
rallytime
94a00c66eb Write a unit test demonstrating stack trace in #31135
Here is the stack trace that happens when running file.line with
mode=replace on a file that exists, but is empty, as described in
the bug report:

unit.modules.file_test.FileModuleTestCase.test_replace_line_in_empty_file  .................................................
   Traceback (most recent call last):
     File "/root/SaltStack/salt/tests/unit/modules/file_test.py", line 593, in test_replace_line_in_empty_file
       mode='replace'))
     File "/root/SaltStack/salt/salt/modules/file.py", line 1523, in line
       for line in body.split(os.linesep)])
   TypeError: expected a character buffer object
2016-11-03 14:57:10 -06:00
rallytime
4080cb4f12 Merge branch '2016.3' into 'carbon'
No conflicts.
2016-11-03 08:54:32 -06:00
Pablo Suárez Hernández
ffc596f215 Including resolver params for Zypper debug-solver
Now '--no-allow-vendor-change' and '--from' parameters are included
into the zypper --debug-solver call before performing a dry-run dist-upgrade.
2016-11-03 08:34:26 +00:00
Mike Place
60b5085696 Merge pull request #37315 from svenauhagen/feature/iptables
iptables changes for match recent
2016-11-03 13:16:49 +13:00
Mike Place
f00dc3e382 Remove trailing whitespace 2016-11-03 13:16:41 +13:00
rallytime
c31f879f8b Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/cloud/clouds/vmware.py
2016-11-02 11:33:21 -06:00
Nicole Thomas
8679ce4510 Back-port #37321 to 2016.11 (#37409)
* status.uptime - avoid nawks srand, causes problems on smartos

* status.uptime - remove docs comment that no longer applies

* status.uptime - optimize a tiny it and get rid of the need for a shell

* status.uptime - actually remove the now redudent line too

* status.uptime - readded fallback to uptime binary, atleast we get something on the BSDs too now

* status.uptime - support python pre 2.7 as per damon-atkins

* status.uptime - want OpenBSD support

* status.uptime - want freebsd support, removed fallback once again so we are consistant

* status.uptime - want NetBSD support

* status.uptime - fold @jfindlay  work for OSX into mine, tweak mine based on his work

* status.uptime - push tests from @jfindlay with updates SunOS test

* status.uptime - remove cmd.run_all as it was replaced by sysctl.get

* status.uptime - attempt to fix sunos test

* Figured out why there was a cmd.run mock  was there.

* add note for SunOS, so we do not forget

* Update version added tag
2016-11-02 09:50:30 -06:00
Erik Johnson
3014afd517 Overhaul archive.extracted state
This fixes a number of annoyances with the archive.extracted state.
Rather than re-state the changes again here, they can be observed in the
carbon release notes, where they have been documented.
2016-11-01 19:35:57 -05:00
rallytime
e082ff538b Fix failing test now that we're raising a CommandExecutionError
Also adds a test to check that the CommandExecutionError is raised
when the filename is not present.
2016-11-01 15:51:09 -06:00
rallytime
fd380c79b9 Add test case to reproduce dnsmasq.set_config failure in #34263 2016-11-01 14:31:14 -06:00
rallytime
e57fb947c6 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/modules/status.py
2016-11-01 12:56:04 -06:00
Sven Auhagen
7c6ff77c98 Fix name_, for loop and add test cases 2016-11-01 19:32:49 +01:00
Mike Place
d69142a3a7
Fix status test
Correctly raise expected exception
2016-11-01 12:06:20 +13:00
rallytime
ba5583938b Update mac_package unit tests: remove --no-compress flag 2016-10-31 16:13:48 -06:00
Mike Place
eaafb29ff2 Merge pull request #37321 from sjorge/carbons-status-uptime
Carbons status uptime
2016-11-01 00:29:17 +13:00
Super-User
d73c748907 Figured out why there was a cmd.run mock was there. 2016-10-31 09:57:05 +01:00
Super-User
9d05c6aaaa status.uptime - attempt to fix sunos test 2016-10-31 08:31:19 +01:00
m03
4c6317fdc7 Better return data from logrotate module 2016-10-30 01:29:52 -07:00
Super-User
b12d19e339 status.uptime - push tests from @jfindlay with updates SunOS test 2016-10-30 00:17:48 +02:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
2016-10-28 11:58:41 -06:00
rallytime
e4dc059959 Update Carbon versionadded tags to 2016.11.0 in tests/* 2016-10-27 10:04:13 -06:00
rallytime
a9da340759 Merge branch 'carbon' into 'develop'
No conflicts.
2016-10-25 10:40:15 -06:00
Pablo Suárez Hernández
32f44b43ee Fix Zypper module and tests for Carbon 2016-10-25 11:08:00 +01:00
rallytime
027e2212c9 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/modules/status.py
  - salt/modules/win_status.py
  - salt/modules/zypper.py
  - salt/utils/network.py
  - tests/unit/transport/zeromq_test.py
2016-10-24 09:29:53 -06:00
Mike Place
c5d81a8ade Merge pull request #37158 from jfindlay/mac_skip_uptime
add mock for `status.uptime` unit test
2016-10-24 12:13:53 +09:00
rallytime
8fff95b3b4 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/gpg.py
  - salt/modules/zypper.py
2016-10-21 16:09:17 -06:00
Justin Findlay
094eac06eb modules.status.uptime unit test: mock on linux 2016-10-21 15:50:42 -06:00
Pablo Suárez Hernández
01b0a6917c Minor pylint fixes 2016-10-20 11:33:11 +01:00
Pablo Suárez Hernández
7dbb0bd252 Unit tests fixes 2016-10-20 10:59:48 +01:00
Pablo Suárez Hernández
a092a974da Refactor: Cleanup and pylint fixes 2016-10-19 14:57:03 +01:00
Pablo Suárez Hernández
1331ae5c72 Unit tests for zypper upgrade and dist-upgrade 2016-10-19 13:21:55 +01:00
Mike Place
d97f649557 Merge pull request #37066 from Unity-Technologies/feature/powercfg_schemes
Allowed for specifying the scheme for powercfg
2016-10-19 11:39:02 +09:00
rallytime
bab91dbe91 Don't compare a (0,) object to None in skipIf
We should check to make sure the version is > 0 to run the test
2016-10-18 10:22:31 -06:00
rallytime
ec7626d6ea Revert "Spelling fix: the module is named dockerng, not just docker."
This reverts commit 94f72813c27299994e6522480bab760ca9f22878.
2016-10-18 09:49:07 -06:00
rallytime
fe2a6dbc7f Spelling fix: the module is named dockerng, not just docker. 2016-10-18 09:49:07 -06:00
rallytime
a45b75cd9c Pylint fix: remove extra comma 2016-10-18 09:49:07 -06:00
rallytime
beed75ef39 Just use nested with statements so the test will work on all Pythons 2016-10-18 09:49:07 -06:00
rallytime
5e2f20ad37 Maintain two different tests for Py2 vs 3 in dockerng_test file 2016-10-18 09:49:07 -06:00
Mike Place
4b6838baf9 Fix Docker test for Py3
Move to Py3-compat nested context manager approach.

Fix bug in thin generation where non-abs paths were not avoided.
2016-10-18 09:49:07 -06:00
Daniel Hobley
a133a2466e Allowed for specifying the scheme for powercfg 2016-10-18 09:49:07 +02:00
Mike Place
202414c88b Merge pull request #37024 from gtmanfred/hashutil
add the ability to verify github webhook hmac signatures
2016-10-18 10:55:28 +09:00
twangboy
b3b688e298 Fix tests 2016-10-17 13:31:55 -06:00
rallytime
6d0cedcadd Merge branch 'carbon' into 'develop'
No conflicts.
2016-10-17 09:06:12 -06:00
Daniel Wallace
a7f8ca0a84 add the ability to verify github webhook hmac signatures 2016-10-17 07:57:47 -05:00
rallytime
112dc5d9c1 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/cli/salt.py
  - salt/client/__init__.py
  - salt/modules/archive.py
  - tests/integration/modules/pkg.py
2016-10-14 12:03:08 -06:00
Zhi Han
3ddddd82b7 Fix mac_package wildcard install error on mac 2016-10-13 21:29:40 -04:00
Amir Pakdel
d7cfcf4135 Whitespace bugfix in linux acl.getfacl (#36827)
* Whitespace bugfix in linux acl.getfacl

It is a trivial fix

* Whitespace bugfix in linux acl.setfacl

Also updated tests

* Linting
2016-10-13 15:14:09 -06:00
Thomas S Hatch
6b782c15e1 Merge pull request #36755 from terminalmage/issue36671
systemd.py: check retcode for service availability in systemd >= 231
2016-10-13 13:41:50 -06:00
Nicole Thomas
a2206e805f Merge pull request #36938 from wanparo/develop
acl.delfacl: fix position of -X option to setfacl
2016-10-13 08:53:34 -06:00
rallytime
29d299d23b Adjust linux_acl unit test argument ordering 2016-10-12 10:57:42 -06:00
rallytime
55fe0aa2e4 Merge branch 'carbon' into 'develop'
No conflicts.
2016-10-11 17:22:12 -06:00
rallytime
b196c9336a Merge branch '2016.3' into 'carbon'
No conflicts.
2016-10-11 13:54:09 -06:00
rallytime
c09b9d6e6a Merge branch '2015.8' into '2016.3'
No conflicts.
2016-10-10 10:21:04 -06:00
rallytime
d07f5612ee Merge branch 'carbon' into 'develop'
No conflicts.
2016-10-10 10:18:02 -06:00
Erik Johnson
7c78d6f419 Add unit tests for systemd scope usage 2016-10-07 17:35:09 -05:00
rallytime
2e34277b65 Add '--no-psqlrc' option to new-to-carbon postgres unit test 2016-10-07 16:10:57 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
2016-10-07 09:51:21 -06:00
Mike Place
1284de27fc Merge pull request #36789 from maximeguillet/fix-psqlrc-pg9.6
Fix behavior of psql -c option with postgresql 9.6
2016-10-06 20:24:51 +09:00
Maxime Guillet
b59c23bef1 Fix one remaining postgresql tests linked to #36787. 2016-10-05 17:05:10 +02:00
Mike Place
53f1523cb8 Merge pull request #36790 from cachedout/pr-36727
Merge forward carbon to develop
2016-10-05 23:57:23 +09:00
Maxime Guillet
8b92ae2061 Fix postgresql tests using position in the argument list of psql.
Some tests use position number in the argument list of psql command
to check their results. As #36787 add one element, next position
in the list must be used.
2016-10-05 16:08:42 +02:00
Maxime Guillet
21f2a17a07 Fix postgresql tests by adding --no-psqlrc option introduced by #36787. 2016-10-05 14:43:02 +02:00
Erik Johnson
d916c2b49c Handle cases where retcode/output feature is backported
This will handle the case of RHEL 7.3, which maintains an older version
of systemd with the retcode/output changes from "systemctl status" in
systemd 231 backported.
2016-10-04 09:55:56 -05:00
Erik Johnson
b3364646ad Update systemd module unit tests
The _systemctl_status() function has changed its return data, this
commit updates the affected tests to reflect this.
2016-10-03 22:51:43 -05:00
Mike Place
d2ab4b11b5 Merge pull request #36689 from msiebeneicher/develop
Feature :: provide state.show_state_usage call
2016-10-03 20:53:01 +09:00
rallytime
24b8bba145 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-09-30 16:13:08 -06:00
rallytime
5d7b4e4511 Merge branch 'carbon' into 'develop'
Conflicts:
  - conf/master
  - doc/ref/configuration/logging/index.rst
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
  - salt/modules/gpg.py
2016-09-30 16:10:33 -06:00
Sergey Kizunov
7337ddb1a4 Updated rabbitmq module unit test
Updated to track changes to the rabbitmq module for the Windows
port.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-09-29 11:15:02 -05:00
msiebeneicher
8c8ac46b74 added unit tests for state.show_state_usage functionality 2016-09-29 18:06:45 +02:00
rallytime
112903ad7e Merge branch '2016.3' into 'carbon'
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/daemons.py
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/modules/archive.py
  - salt/modules/cmdmod.py
  - tests/unit/states/service_test.py
2016-09-29 09:56:43 -06:00
Denys Havrysh
bba9d0d105 alternatives.install state: detect alternatives command failed 2016-09-29 18:09:16 +03:00
Mike Place
ccd92d22d2 Merge pull request #36621 from terminalmage/fix-shadowed-builtins
Fix shadowed builtins
2016-09-29 11:25:54 +09:00
Erik Johnson
62729eff8d Update tests to include fix for renamed function 2016-09-28 11:00:33 -05:00
Erik Johnson
283aca8f2a Update test to reflect new function signature 2016-09-27 23:13:19 -05:00
rallytime
a828bdd0b8 Update test mocks for cmd.run_all dicts 2016-09-27 20:55:39 -06:00
Mike Place
4956d7d5a3
Merge branch '2016.3' into 2016_3_develop 2016-09-26 21:47:32 +09:00
rallytime
d0ec4ead2a Merge branch '2016.3' into 'carbon'
No conflicts.
2016-09-23 08:32:17 -06:00
rallytime
8e0b1a3718 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-22 10:09:06 -06:00
rallytime
18c6a736cf The "assert_called_once" mock testing function is only available in mock 2.0.0 or greater
We have a couple of tests using the "assert_called_once" function, however, our salt-jenkins
states pin the version of mock at 1.0.1 (This is the last version that is compatible with
Python 2.6). We either need to use something else that works for all versions of mock or gate
the test.

In the pacman tests, it is possible to use "assert_called_with" instead of "assert_called_once"

In the dimension_data and gce unit tests, we need to gate the assertion behind a mock version check.
This way the tests won't fail if the version of mock installed is less than 2.0.0.
2016-09-21 14:46:50 -06:00
Mike Place
67b78c7d97 Merge pull request #36423 from kraney/boto_apigateway_usage_plan
Boto apigateway usage plan
2016-09-20 15:47:03 +09:00
Winston Liu
962b0439a5 rest of the unit tests for usage plans related functionality in boto_apigateway module. 2016-09-19 10:54:38 -07:00
Winston Liu
37a0f17191 unit tests for describe/create usage plan. 2016-09-19 09:43:36 -07:00
rallytime
93d34af667 Merge branch 'carbon' into 'develop'
Conflicts:
  - tests/unit/utils/schema_test.py
2016-09-16 14:38:10 -06:00
rallytime
0db2b67ed4 Whitespace fix 2016-09-16 13:25:08 -06:00
rallytime
26cf545d03 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/utils/gitfs.py
  - tests/unit/modules/disk_test.py
2016-09-16 10:35:49 -06:00
Michael Stella
8b877f014d 'All' grants for PostgreSQL.
This update allows granting privileges on ALL tables or ALL sequences
in a given schema.  Such as:

GRANT SELECT ON ALL TABLES IN SCHEMA public TO 'monkey';
2016-09-15 17:22:08 -04:00
Michael Stella
fbbe9ec571 Quote postgres privilege target names (#36249)
* Quote postgres privilege target names

Postgres lets you put characters in table/database names which you then must
quote.  So we should always quote.

* Updating unit tests

* Also quote role names.

Role names can also have dashes (or others) in them, so we must also quote
them.
2016-09-15 15:12:41 -06:00
Nicole Thomas
a4bbd5e3d7 Add resize2fs unit test from blockdev_test to disk_test (#36346)
The blockdev module is being slowly deprecated and its functions moved to
to the disk module instead. There is a test for resize2fs in the blockdev_test
file in the 2015.8 branch (which matches the resize2fs function in the blockdev
module), but this function was moved to the disk file in 2016.3. The test was
never moved over.

I discovered this during a merge forward in #36344. This PR adds the
test from 2015.8 blockdev_test to the 2016.3 disk_test.py, and is adjusted
to work with the disk module accordingly.
2016-09-15 14:37:53 -06:00
Pablo Suárez Hernández
dc518c5340 Skip test_resize2fs if resize2fs does not exists (#36325) 2016-09-15 10:14:50 -06:00
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