Commit Graph

4191 Commits

Author SHA1 Message Date
Bo Maryniuk
15ecb083e3 Add test for the first in line from platform.node is used (mostly) 2016-06-14 16:29:06 +02:00
Bo Maryniuk
eed433ec60 Add unit test to check on duplicate hostnames in the pool 2016-06-14 16:29:06 +02:00
Bo Maryniuk
71a3e91f57 Add unit test for check if the minion ID is distinct in the pool 2016-06-14 16:29:06 +02:00
Bo Maryniuk
a3266c6f2f Fix network test for Solaris 2016-06-14 16:29:06 +02:00
Bo Maryniuk
2d4a9939a9 Rename network unit test into a proper name 2016-06-14 16:29:06 +02:00
rallytime
c57bcebaf8 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/states/boto_lambda.py
2016-06-13 11:18:53 -06:00
Adam Chainz
64d9a62f89 Convert readthedocs links for their .org -> .io migration for hosted projects
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
2016-06-11 12:33:37 +01:00
rallytime
b4ab322ce1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/saltutil.py
2016-06-10 13:41:53 -06:00
Nicolas Delaby
f806c7e290 [boto_lambda] handle ommitted Permissions parameter (#33908)
* a bit of pep8

* Don't fail if `Permssions` is None
2016-06-10 13:31:22 -04:00
Mike Place
abf5131c0a Adds absolute value option to disk state (#33918) 2016-06-10 11:08:57 -04: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
01aaf3e2a9 Merge pull request #33771 from twangboy/win_dism
Additional functionality to win_dism.py
2016-06-08 06:58:20 -07: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
Nicolas Delaby
0d40e1c4f3 Add support for edge case when Cmd and Entrypoint can't be blanked 2016-06-08 10:46:24 +02: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
421dc97957 Fix/add unit tests for state 2016-06-07 12:52:01 -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
db3cc8dcee Merge pull request #33779 from bodhi-space/develop
INFRA-1594 - Add various S3 functions needed for optionally emptying …
2016-06-06 14:52:07 -07:00
Tom Williams
102d696460 INFRA-1594 - fix up unit tests 2016-06-06 14:37:38 -04:00
Jeffrey 'jf' Lim
ffa788fd67 Fix minor typo in test name in tests/unit/states/dockerng_test.py 2016-06-07 01:11:30 +08:00
Justin Findlay
90aee79c39 states.service.mod_watch: update unit test 2016-06-06 10:54:16 -06:00
Dan Slimmon
f87bc347fd Fixed ACL user comparison. Resolves #33754. 2016-06-04 15:14:00 +00:00
Mike Place
a5684ed123 Merge pull request #33670 from rallytime/fix-33605
Handle non-ascii package names in state.format_log
2016-06-03 09:16:52 -07: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
C. R. Oldham
35bc42410f Merge pull request #33705 from alexbleotu/json_schema_extension-gh
JSON Schema Extension
2016-06-03 08:42:18 -06:00
Alexandru Bleotu
d69ce3a84f JSON Schema Extension
- added support for JSON schemas that validate complex JSON objects
  (JSON objects that have as attributes other JSON objects)
2016-06-03 14:03:26 +01: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
Justin Findlay
87e018af2a states.test.configurable_test_state: add unit tests 2016-06-02 17:20:36 -06:00
rallytime
59bd51f4c8 Update test to correct iteration 2016-06-02 14:32:21 -04:00
Mike Place
64c7dd7032 Merge pull request #33626 from evonzee/feature/issue-15749
Feature/issue 15749
2016-06-02 11:23:36 -07:00
Dmitry Kuzmenko
66bd75cd3b New schedule tests and fixes 2016-06-02 17:14:50 +03: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
rallytime
a580d1c6e0 Add unit test for format_log change 2016-06-02 09:26:39 -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
Mike Place
9ed809f557 Merge pull request #33610 from tonybaloney/servicenow_fix
Change the ServiceNow module's non_structured_query method to support kwargs
2016-05-31 09:23:18 -07:00