Commit Graph

2595 Commits

Author SHA1 Message Date
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