valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
87,609 Commits 24 Branches 182 Tags 341 MiB
b42b762c57
Commit Graph

1327 Commits

Author SHA1 Message Date
Mike Place
60750a1619
Fix test 2017-04-06 10:48:27 -06:00
Nicole Thomas
4d7871e4d7 Merge pull request #40494 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-04-05 14:15:05 -06:00
rallytime
71f3c73150 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/template.py
  - salt/utils/pycrypto.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_artifactory.py
  - tests/unit/test_template.py
 2017-04-05 13:02:14 -06:00
Nicole Thomas
59db716817 Merge pull request #40510 from twangboy/deprecate_win_update 
Add deprecation warnings to win_update state and execution modules
 2017-04-05 11:47:56 -06:00
twangboy
70b61dda39 Fix unit tests, spell Fluorine correctly 2017-04-04 23:42:36 -06:00
Pedro Algarvio
785698d2ce
Import for the original module 2017-04-04 18:04:38 +01:00
Pedro Algarvio
8031ac0209
Move mixins to tests.support.mixins. 
The adapted config mixin get config methods are not static methods
 2017-04-04 17:29:34 +01:00
Pedro Algarvio
f8d7530a58
Proper mocking. 2017-04-01 14:22:59 +01:00
Pedro Algarvio
9dbdee68ba
Move tests to the right test module 2017-04-01 14:22:54 +01:00
rallytime
8f084f7056 Update unit test to look for actual string comment 2017-03-31 15:34:24 -06:00
Lukas Raska
24cc9b2a0c [WIP] Refactor Elasticsearch execution and state modules (#40192) 
* Add Ingest pipeline methods to Elasticsearch execution module

* Refactor Elasticsearch execution module and properly handle exceptions

* Throw CommandExecutionError in methods applicable for different Elasticsearch versions

* Refactor Elasticsearch states to reflect execution module changes

* Add state for managing Elasticsearch pipelines

* Fix few typos in Elasticsearch module, return None when deleted document doesn't exist

* Implements stats and health methods for Elasticsearch

* Add Elasticsearch methods to open/close index, manage search templates and repositories

* Merge existing Elasticsearch states into single one, add Search Template handling

* Add index alias state for Elasticsearch, fix documentation

* Catch all global exceptions in Elasticsearch states, unit test all of them

* Implement few Unit tests for Elasticsearch execution module, merge fixes into deprecated elastic states

* Implement additional unit tests for Elasticsearch execution module

* Finalize Elasticsearch module documentation
 2017-03-30 13:22:58 -06:00
rallytime
52edbffc85 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/cache/all/index.rst
  - doc/topics/cache/index.rst
  - salt/cache/localfs.py
  - salt/modules/boto_rds.py
  - salt/roster/cloud.py
  - salt/states/virtualenv_mod.py
  - tests/integration/states/test_archive.py
  - tests/unit/modules/test_dockermod.py
  - tests/unit/states/dockerng_test.py
 2017-03-28 17:09:30 -06:00
Pedro Algarvio
e95b7e062c
Proper mocking. Fix tests expectations. Runs on non windows too. 2017-03-28 19:04:03 +01:00
Pedro Algarvio
2b8d26b811
The develop branch no longer targets python 2.6 2017-03-28 19:04:03 +01:00
Pedro Algarvio
845cbabe97
Code cleanup. Proper mocking. 2017-03-28 19:04:03 +01:00
Pedro Algarvio
99bc71dc4e
Proper mocking. 2017-03-28 19:04:01 +01:00
Pedro Algarvio
d397763553
Adjust to the new LoaderModuleMockMixin usage 2017-03-28 19:03:59 +01:00
Pedro Algarvio
e7768705f9
Allow passing different loader_module_globals per loader_module 2017-03-28 19:02:51 +01:00
Pedro Algarvio
9b1e55aa85
Import the full module namespace to avoid import shadowing. 
https://github.com/saltstack/salt/pull/39996#issuecomment-287857698
 2017-03-28 19:02:47 +01:00
Pedro Algarvio
5216ff0932
Code cleanup. Proper mocking 2017-03-28 19:00:52 +01:00
Pedro Algarvio
1f7a0aa65b
Proper mocking 2017-03-28 19:00:51 +01:00
Mike Place
d7e745a53a Merge pull request #40281 from terminalmage/rename-docker 
Rename docker execution module to avoid shadowing in the loader
 2017-03-28 11:06:08 -06:00
Mike Place
2d2cb5b837 Merge pull request #40333 from gtmanfred/2016.11 
fix some test=True comments
 2017-03-28 10:11:00 -06:00
Erik Johnson
774a3f1147 Rename docker execution module to avoid shadowing in the loader 
With the merging of #39996, salt/modules/docker.py now imports
salt.utils.docker. However, our loader appends the module dir (in
this case salt/modules/) to sys.path temporarily for the length of the
loading process. So, as the docker execution module tries to import
salt.utils.docker, when salt.utils.docker attempts to do an "import
docker", and docker-py is *not* installed, this results in
salt/modules/docker.py (the docker execution module) being loaded in its
place, which results in tracebacks in the minion log.

Renaming the docker execution module keeps this import shadowing from
occurring. Note that we don't need to do this for the placeholder
salt/states/docker.py as it does not import salt.utils.docker.
 2017-03-28 10:50:47 -05:00
Daniel Wallace
5596620dfb fix some test=True comments 
Alternatives should say it is setting the symlink to `path` instead of
`current` which it is already set to

ssh_auth.absent should say it is going to remove the key, unless the status is
set to `add`, then it is already absent

Fixes #40322
Fixes #40321
 2017-03-27 18:19:52 -05:00
Anthony Shaw
ee0daa1b64
remove unused imports 2017-03-25 11:44:55 +11:00
Anthony Shaw
10c84303db
fix unit tests 2017-03-24 15:13:03 +11:00
Anthony Shaw
605a12dbc0
linting 2017-03-24 14:05:19 +11:00
rallytime
a9c5eebaf0 Clean up dockerng unit tests to avoid global variables and fixup some patching 2017-03-23 12:44:57 -06:00
Anthony Shaw
1efd5a19fb
linting 2017-03-23 22:12:12 +11:00
Anthony Shaw
065e45188d
fix up tests 2017-03-23 20:18:41 +11:00
Erik Johnson
5ad476936d Overhaul Docker support 
This does the following:

- Splits states for container/volume/image/network management into four
  separate state modules.

- Preserves backward compatibility by making ``docker.image_present``
  invoke ``docker_image.present``, etc.

- Changes how Salt detects that a container needs to be replaced.
  Instead of comparing each passed argument to the named container's
  configuration, it creates a temporary container, and compares that
  container to the named container. If the two differ, then the older
  container is removed, and the new one is renamed and started, becoming
  the named container.

- Removes the unit tests for container management and replaces them with
  integration tests.

- Adds unit tests for the new salt.utils.docker
 2017-03-21 16:53:19 -05:00
Erik Johnson
6caedb0de8 Change imports for dockerng tests 
This should fix path issues in the test suite.
 2017-03-21 11:56:29 -05:00
Bo Maryniuk
52125c732b Pylint: W1699 2017-03-20 22:31:54 +01:00
Bo Maryniuk
fa8bd76c8b Fix unit test for a deprecation decorator policy 2017-03-20 22:31:54 +01:00
Bo Maryniuk
717c39bb4c Add unit test for batch call 2017-03-20 22:31:53 +01:00
Bo Maryniuk
88dc91f9a7 Add unit test for typed returns 2017-03-20 22:31:53 +01:00
Bo Maryniuk
af81a00130 Add unit test for None returns 2017-03-20 22:31:53 +01:00
Bo Maryniuk
88c6e9485b Add docstring to the unit test 2017-03-20 22:31:53 +01:00
Bo Maryniuk
4fa3793bee Add unit test for module.xrun call with the correct unnamed arguments 2017-03-20 22:31:53 +01:00
Bo Maryniuk
796b0e2690 Add unit test to call a function with an unexpected keywords 2017-03-20 22:31:53 +01:00
Bo Maryniuk
2314b49f54 Add unit test to call function with a proper arguments 2017-03-20 22:31:53 +01:00
Bo Maryniuk
3ab7d6c458 Refactor unit tests for reusing constants 2017-03-20 22:31:53 +01:00
Bo Maryniuk
3d63165f16 Add unit test for missing args 2017-03-20 22:31:53 +01:00
Bo Maryniuk
33a16d69cc Add xrun unit test for module is ran in a test mode 2017-03-20 22:31:53 +01:00
Bo Maryniuk
6bbf7232a1 Add test for module is not available 2017-03-20 22:31:53 +01:00
Bo Maryniuk
803b3ce637 Fix existing tests by proper patching and reusing existing constants 2017-03-20 22:31:53 +01:00
Nicole Thomas
08d6b96171 Merge pull request #39977 from bodhi-space/infra4506 
INFRA-4506 - various fixes as detailed below
 2017-03-14 15:52:32 -06:00
rallytime
f6cd372358 Update boto_asg state file unit test mocks to account for changes in #3997 2017-03-14 14:05:20 -06:00
Pedro Algarvio
0b41b92d7d
Use salt.utils.versions instead of distutils.version 2017-03-08 19:22:33 +00:00
Mike Place
71410047f0 Merge pull request #39682 from ni3mm4nd/mongodb_user 
Add support for user roles in present state
 2017-03-02 10:17:38 -07:00
Mike Place
320b39bc12 Fix broken test and lint issue 2017-03-01 11:57:28 -07:00
Mike Place
4a0c2dfcc3 Merge pull request #39725 from bodhi-space/infra4487 
INFRA-4487 - 'test=True' should return True rather than None if no changes are scheduled.
 2017-03-01 10:02:11 -07:00
Kadlec Jan
d5d99d6399 recteate unit tests 2017-03-01 07:13:28 +01:00
Tom Williams
aa8d822e78 INFRA-4487 - fix unit test to match corrected return value 2017-02-28 21:01:57 -05:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt. 
Let's drop the salttesting dependency cycle.
 2017-02-28 22:52:49 +00:00
Pedro Algarvio
1e2753c875
Fix imports after renames 2017-02-23 23:19:43 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest. 2017-02-23 23:19:42 +00:00
Pedro Algarvio
e48ea8fa1b
Don't use assert_called_once() or assert_not_called(). 
These worked in Py2 but not in Py3.
A read of http://engineroom.trackmaven.com/blog/mocking-mistakes/ specially the section "Mocking the unexpected" will enlighten one.
 2017-02-23 10:40:58 +00:00
rallytime
2595ac383d Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/docker.py
  - salt/states/docker.py
 2017-02-22 16:24:36 -07:00
rallytime
c613d19e76 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - salt/states/dockerng.py
 2017-02-21 13:59:14 -07:00
Erik Johnson
c673d06f48 Rename dockerng state/execution module to docker 2017-02-18 21:58:25 -06:00
Erik Johnson
6e24dd85c4 Remove dockerio state/module (moved to salt-contrib) 2017-02-18 21:58:24 -06:00
Pedro Algarvio
90adbe925f
Force dictionary order 2017-02-17 20:48:56 +00:00
Pedro Algarvio
1d060096e3
Force ordering under Py3 2017-02-17 20:48:55 +00:00
Mike Place
e652a45592
Fix mocks in win_disim tests 2017-02-16 12:26:49 -07:00
Nicole Thomas
3a39e15dff Rewrite blockdev unit test to target more specific state returns (#39402) 
The previous way this test was written was over-mocking some of the
state returns as well as tested and asserted against incorrect
behavior as shown in issue #39255. (The test asserted that a return
of '' from the call to _checkblk() was correct, which was hiding a
bug as noted in #39255 and fixed in #39272.)
 2017-02-14 13:49:14 -07:00
rallytime
609e6e4b23 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/win_lgpo.py
  - salt/utils/aws.py
  - tests/unit/utils/schema_test.py
 2017-02-09 10:29:40 -07:00
nicholasmhughes
8d8ba9c7d2 added the new getconfig function to the test 2017-02-06 09:55:09 -05:00
rallytime
ee2edda14e [PY3] Test comment contents more carefully for list stability 
Stabilizes these tests by avoiding errors when cheese, crackers
order changes in the comment and gives errors like:

-  'comment': 'Kernel modules crackers, cheese are already present',
?                                     --------

+  'comment': 'Kernel modules cheese, crackers are already present',
?                            ++++++++
 2017-02-02 22:34:20 +00:00
Winston Liu
c2d35d181f update botocore dependencies, skip if not met. 2017-01-31 10:49:34 -08:00
Julien BONACHERA
1e06f388bb make openvswitch state work with python3 (#38873) 
* openvswitch: add a basic unit test for openvswitch

* openvswitch: enclose comments_* variables into a map

* openvswitch: only prepare error messages if type parameter is present

* openvswitch: add test case: create a GRE port

* openvswitch: remove trailing whitespace

* openvswitch: add missing "comments" variable

* openvswitch: pep8 compliance

* openvswitch: mock dig.check_ip

* openvswitch: rename "type" argument into "tunnel_type"

* openvswitch: reference bridge_exists before assignment

* openvswitch: reference port_list before assignment

* openvswitch: add upgrade note about "type" option renaming
 2017-01-30 09:56:10 -07:00
rallytime
3f74d697b9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - pkg/windows/build_pkg.bat
  - salt/modules/archive.py
 2017-01-20 12:07:19 -07:00
Erik Johnson
d10c068e25 Update archive state unit tests to reflect symlinks in archive.list 2017-01-20 08:49:40 -06:00
Mike Place
67383b01e1 Merge pull request #38717 from rallytime/py3-test-fixes 
A couple of Python 3 compatibility fixes
 2017-01-14 22:44:28 -07:00
rallytime
29fec06671 [module_test.py] Don't rely on list ordering: assert items are in 
comment
 2017-01-12 14:19:31 -07:00
Alexandru Bleotu
0b848ec184 Fixed WinrepoTestCase.test_genrepo to load BASE_FILE_ROOTS_DIR from salt.syspaths 2017-01-05 17:31:33 +00:00
rallytime
9ad362fbde Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/states/kapacitor.py
 2017-01-03 10:17:18 -05:00
Mike Place
aa0c843553 Merge pull request #38461 from alprs/fix-kapacitor_changes 
Improvements/fixes to kapacitor task change detection
 2016-12-29 10:08:46 -07:00
Andreas Lutro
52721e97d6 clean up and fix tests 2016-12-29 11:14:24 +01:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
Sevag Hanssian
727194b2a0 Add strict flag to ini.options_present 2016-12-27 11:50:10 -05:00
rallytime
494a06bee2 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-12-20 10:03:44 -07:00
Erik Johnson
79231a5d8a archive.extracted: don't try to cache local sources (#38285) 
* archive.extracted: don't try to cache local sources

This will keep us from trying to cache file when we already have it
locally, which will help significantly with larger archives.

* Update tests to reflect change in cache behavior

* Add mock return for /bin/tar

This fixes failing tests for Ubuntu 14
 2016-12-19 14:37:58 -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
Erik Johnson
845e3d0e75 Update tests to reflect change in cache behavior 2016-12-16 14:09:48 -06:00
rallytime
05ec9f4b5b Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/netapi/rest_cherrypy/app.py
 2016-12-15 20:47:35 -07: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
Mike Place
6c1ca9dae7 Merge pull request #38236 from gtmanfred/2016.11 
SELINUXTYPE should not be changed
 2016-12-15 03:37:06 -07:00
Daniel Wallace
d1b070c894 clean up selinux unit test 2016-12-14 11:33:00 -06: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
rallytime
fec9dec23a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/daemons_test.py
  - tests/unit/states/file_test.py
 2016-12-06 16:23:51 -07:00
rallytime
186e2d0d03 Don't allow libcloud mock module injection in unit/states/libcloud_dns_test.py either 2016-12-06 09:24:07 -07:00
rallytime
1da7aacfbe Update unit tests to account for additional file.search call 
Also removed some mocks that were not needed anymore for the
calls to ``file.contains_regex_multiline`` because that function
is no longer called in the state file.
 2016-12-02 11:22:10 -07:00
Mike Place
6ffea40dee Merge pull request #37813 from twangboy/windows_perms 
Windows Perms for file.directory and file.managed
 2016-11-30 11:12:26 -07:00
rallytime
4760455600 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/dockerng.py
  - tests/unit/modules/linux_acl_test.py
 2016-11-29 09:31:05 -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
Daniel Boughton
ddc238df36 Fixed augeas_test.py to match True v.s. None for test_change_in_test_mode 2016-11-27 08:40:05 -05:00
twangboy
c11506333c Fix some lint, fix a test 2016-11-22 10:05:49 -07:00
castor-morveer
6246a98cfa Boto apigateway optional stacktrace in response mapping (#37618) 
* adding optional response template parameters for normal and error cases

* making optional response templates affect checksum calculation in order to correctly determine if the service needs updating

* Remove trailing whitespace

* removing trailing whitespaces

* correcting invalid mock values in unit test code
 2016-11-21 14:47:52 -07:00
kevin
1865b13645 Fix 'present' option when used without 'key_type' 2016-11-14 12:16:51 -07:00
rallytime
1b5f89577e Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-14 09:19:49 -07:00
rallytime
4c245a3fa5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/x509.py
 2016-11-10 16:51:52 -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
rallytime
f44e14b63c Merge branch 'carbon' into '2016.11' 
Conflicts:
  - salt/modules/file.py
 2016-11-09 12:56:58 -07:00
Erik Johnson
2fc0b222bc Fix regression in service.dead state (#37562) 
* Fix regression in service.dead state when service is not available

This was originally broken in c4f899b.

* Add unit test for issue 37511
 2016-11-08 14:58:33 -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
eae3b9e30f Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-07 08:15:42 -07:00
rallytime
9b3e4414c8 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/mac_power.py
  - salt/modules/win_dsc.py
  - salt/modules/win_servermanager.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/gitfs.py
 2016-11-04 15:23:49 -06: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
Mike Place
898d28d2c9 Merge pull request #37237 from lyft/add-kinesis-support 
Add Amazon Kinesis support via boto3
 2016-11-04 18:30:43 +13:00
Tanoti
3293340679 Add state.grains.exists and unit tests 2016-11-02 11:32:05 +00: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
Nevins Bartolomeo
99d2c360ed making messaging in tests match new return 2016-10-25 09:38:54 -04:00
Megan Kercher
f8e95a9813 finish present unit test, bugfix present ret 2016-10-24 15:11:11 -07:00
Megan Kercher
ce76611c35 get absent test working 2016-10-24 11:45:32 -07:00
Megan Kercher
b2e76a3cc0 edit comments, most of unit test: 2016-10-24 11:14:53 -07:00
Erik Johnson
1caf1f6770 Use a default prefix for the mkstemp utils function (#37022) 
* Move salt.utils.mkstemp() into salt.utils.files

Also use a default prefix

* update refs to salt.utils.mkstemp

* Update test to use new path to mkstemp helper func
 2016-10-16 16:12:56 -06:00
rallytime
b7d9bf0281 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-14 12:06:31 -06:00
Daniel Hobley
0aa6ecfb7f Add the option to skip updating the head for a hg latest state (#37002) 
- Updated hg state tests
 2016-10-14 09:07:33 -06:00
rallytime
1e7f56c4bb Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-13 10:38:19 -06:00
Nicole Thomas
3ac9ced202 Merge pull request #36241 from hrumph/cert_problem 
Fixes #36240
 2016-10-12 17:28:35 -06:00
rallytime
32846794c8 Update mocks for failing tests in win_certutil_test 2016-10-12 11:31:58 -06:00
Jorge Schrauwen
8b9648cd97 [develop] salt.modules.at was hopelessly broken on Solaris-like platforms (#36873) 
* disable current at module on solaris, only compute job_kw_regtex once

* provide at_solaris (virtual=at) for Solaris-like systems

* add proper maintainer header

* forgot to update the docs again

* add notice that at module only works on linux, openbsd, and freebsd

* salt.states.at needed a lot of love

* update at_state checks to pass valid date to at.at, at.jobcheck, at.atrm,...

* today I learn about mod_watch, and I want it for at
 2016-10-11 10:33:40 -06:00
rallytime
d07f5612ee Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-10 10:18:02 -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
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
rallytime
7a03c4df8c Fix merge conflict resolution error 
The original conflict resolution adjusted the wrong line. This puts
the test changes on the correct line and restores the original line.
 2016-09-29 11:26:50 -06:00
rallytime
6bc3221f7b Update test to not use the nested context (for Py3 compat) 2016-09-29 11:25:46 -06: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
rallytime
90c66ef756 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/states/service.py
 2016-09-27 21:34:10 -06:00
Denys Havrysh
c4f899b3b3 salt.states.service: detect that service failed to start/stop 2016-09-27 18:24:37 +03: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
df8648d5e3 lint clean up's. 2016-09-19 14:52:41 -07:00
kbelov
b61dc5abda added unit tests for boto_apigateway module for usage plans and usage plan associations 2016-09-19 14:37:52 -07:00
Mike Place
8b7cfa0a5b Merge pull request #36281 from kraney/boto_elasticsearch 
Add support for ElasticsearchVersion parameter
 2016-09-17 19:47:00 +09:00
rallytime
93d34af667 Merge branch 'carbon' into 'develop' 
Conflicts:
  - tests/unit/utils/schema_test.py
 2016-09-16 14:38:10 -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
rallytime
37aea4188a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-16 09:24:17 -06:00
Denys Havrysh
3f308d7694 postgres_extension: report changes when an extension was installed (#36335) 
* postgres_extension: report changes when extension was installed or upgraded

* postgres_extension state: fix unit tests
 2016-09-16 08:23:20 -06:00
rallytime
ee8321eab1 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-14 15:18:22 -06:00
Nicole Thomas
729617923e Back-port #36124 to 2016.3 (#36296) 
* Use /etc instead of /root

* Skip test on anything but linux

* Add missing import (lint)
 2016-09-14 10:08:16 -06:00
Kris Raney
0780555fbc Update unit test. 
Also, version is reported on status rather than config; update code to reflect that.
 2016-09-14 10:40:55 -05: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
mwinnett
b9a98f551e Add win_pki unit tests 2016-09-10 23:31:08 -07:00
Christophe Drevet
4c422f1549 fix cron.absent by identifier on test mode (#36181) 2016-09-09 16:20:58 -06:00
rallytime
167fe00e00 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-09 09:54:17 -06:00
Patrick Valenzuela
b2f1d36e2f Update boto_dynamodb for GSI management and backups (#35878) 
* Update boto_dynamodb state/module for GSI management

* fix trailing whitespace

* modify format strings to conform to file style

* fix lint errors

* fix all but 1 test

* add example
 2016-09-09 08:57:29 -06:00
Mike Place
31b2ef2585 Merge pull request #36124 from twangboy/linux_acl_test_mac 
Skip test on all OS's but linux
 2016-09-09 18:59:35 +09: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
twangboy
e6b34c414d Add missing import (lint) 2016-09-08 15:37:21 -06:00
twangboy
bd65259605 Skip test on anything but linux 2016-09-08 13:46:41 -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
rallytime
7f955bda0a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/modules/puppet_test.py
 2016-09-08 10:55:57 -06:00
Mike Place
1f909038f0 Merge pull request #36139 from meaksh/tests-fixes-for-2016.3 
Fixing unit tests for 2016.3
 2016-09-08 22:20:21 +09:00
Mike Place
f74ca15f50 Remove test for file dir behavior 
Refs #34809
 2016-09-08 11:36:17 +01:00
rallytime
4e9733ad6d Rename dockerio.py unit tests to dockerio_test.py 
These tests have never run automatically because of an incorrect file name.

Added a skipIf on these tests as they are currently non-functioning and the
module they're testing has been deprecated.
 2016-09-08 11:36:17 +01:00
twangboy
da2dded3c3 Use /etc instead of /root 2016-09-07 12:34:33 -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
64b3649ab6 Add unit tests for win_snmp state 2016-09-05 00:30:35 -07:00
rallytime
1bf840b036 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-09-02 09:43:40 -06:00
rallytime
a63c9dfc6a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/service.py
 2016-09-02 08:19:16 -06:00
Mike Place
6cf56843d4 Revert "service state integration tests" 2016-09-02 21:38:15 +09: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
c30abb489a Merge pull request #35927 from saltstack/revert-33010-state_grains_present_assert_only 
Revert "For #31309. If value not supplied only check for existence"
 2016-08-31 18:35:32 +09:00
Mike Place
6559cf347b Revert "For #31309. If value not supplied only check for existence" 2016-08-31 18:06:49 +09:00
Nicolas Delaby
8c7233ad4d Revert "Fixup Docker test" 
This reverts commit 3bd8a7027b.
 2016-08-31 09:48:57 +02:00
Mike Place
3bd8a7027b Fixup Docker test 
This test just looks to see if changes were made.
 2016-08-30 20:49:02 +09:00
Mike Place
65a56a6f51 Merge pull request #33010 from Tanoti/state_grains_present_assert_only 
For #31309. If value not supplied only check for existence
 2016-08-30 17:57:57 +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
rallytime
2b1ad9e9b9 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/gitfs.py
 2016-08-26 14:54:54 -06:00
Hengyang Hu
b89f45598e fix 34241, webutil.useradd_all is deprecated (#35788) 
* fix 34241, webutil.useradd_all is deprecated

* in src webutil.useradd_all get replaced by webutil.useradd, change the mocks accordingly
 2016-08-26 12:52:11 -06:00
Kris Raney
9b3e48bd6e Fix pylint warnings in test code 2016-08-25 15:51:02 -05:00
Kris Raney
170e8238c8 Add cloud watch events unit tests 2016-08-25 13:30:56 -05:00
rallytime
49798ee301 Remove every.weeks reference: not available in relativedelta 2016-08-22 16:07:36 -06:00
rallytime
64e49a43fc Update blockdev references to 'disk' in blockdev state unit test 2016-08-16 15:02:18 -06:00
Nicole Thomas
4b33a19788 Merge pull request #35349 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-11 15:07:43 -06:00
rallytime
102fcbe916 Remove contains_regex_multiline function from file module 2016-08-10 16:43:49 -06:00
rallytime
0b1e9e9a78 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/grains/core.py
  - salt/modules/saltutil.py
  - salt/runner.py
  - salt/states/saltmod.py
  - salt/wheel/__init__.py
  - tests/unit/states/saltmod_test.py
 2016-08-10 10:25:32 -06:00
rallytime
2d3eadfe49 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-09 11:15:48 -06:00
Erik Johnson
d621aa7b61 Update runner/wheel unit tests to reflect new key in ret dict 2016-08-09 08:49:52 -05:00
Mike Place
715dc14b9b Merge pull request #35247 from rallytime/carbon-deprecations 
Remove some of the things that are deprecated in Carbon
 2016-08-09 09:00:27 +09:00
rallytime
4835c31f23 Remove tests for deprecated functions 2016-08-08 09:58:37 -06:00
rallytime
86a5e04417 Pylint fix 2016-08-08 09:53:29 -06:00
rallytime
f42ca4b576 PY3: Don't use contextlib.nested - it is deprecated. 
contextlib.nested is deprecated in Python 3. Instead of having two
different ways of handling nested (PY2) vs ExitStacks (PY3), just use
nested with statements for both.
 2016-08-03 14:49:24 -06: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
ef97c3f474 added unit tests for thing type present/absent states for boto_iot state functions. 2016-08-01 15:23:51 -07:00
Thor K. H
7f6942ec7f Fixing coding style and change w/o updated test 
Fixed testing for tomcat.wait, as well as updating style. Should resolve
any test errors isolated to the module and/or state.
 2016-07-28 21:24:52 +02:00
Thor K. H
bb38055ae4 Initial work on adapting Tomcat to care correctly 
Ensure that lack of version does not result in blank version being used,
as to avoid certain Java EE applications from having issues with paths
when parallell execution is not "supported".

This fixes #24990 by both not adding a blank version if there is no
version to exract, but also by allowing you to overwrite that there
should be *no* version whether or not your WAR-file ends with `-1.2.3`.

Tests added for specifically dealing with no-to-version scenarios,
as well as several minor documentation tweaks that hopefully aren't too
interruptive!
 2016-07-28 20:02:57 +02:00
Eric Radman
42222b06fe Remove stray debug print statements (#35019) 
This cleans up the unit test output a bit, mostly leaving deprecation warnings.
 2016-07-28 09:17:27 -06:00
Erik Johnson
c3f9e13fbe Update unit tests to reflect new behavior of WheelClient/RunnerClient 2016-07-27 13:01:24 -05:00
Mike Place
55bb3d09ab Merge pull request #34919 from tonybaloney/libcloud_dns_states 
Add a new state module for managing DNS records and zones through Libcloud
 2016-07-26 11:51:08 -06:00
Anthony Shaw
8df4c35f5c
zone absent with tests 2016-07-24 19:48:11 +10:00
Anthony Shaw
3b5ddcb607
added zone_present state check 2016-07-24 19:45:06 +10:00
Anthony Shaw
4d7f3169f6
added zone_present state check 2016-07-24 19:43:06 +10:00
Anthony Shaw
fa04e2fcf5
use the correct dictionary structure for state changes 2016-07-24 19:30:32 +10:00
Anthony Shaw
fa5ac70183
add record absent logic and tests 2016-07-24 19:16:48 +10:00
Anthony Shaw
7f28b14958
fix tests 2016-07-24 19:06:34 +10:00
Anthony Shaw
51654e9b7a
add record name to mocks 2016-07-24 17:34:29 +10:00
Anthony Shaw
cb13bb6fba
add test with mocked execution module 2016-07-24 17:13:51 +10:00
Erik Johnson
92fffb06a7 Update unit test 
This unit test asserts based on the args with which a function was
called, and the args were changed which broke the test. This fixes the
test.
 2016-07-22 21:21:55 -05:00
Mike Place
b7fe952427 Remove test for file dir behavior 
Refs #34809
 2016-07-20 08:04:00 -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
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
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
Nicole Thomas
b90ae407f9 Add support for edge case when Cmd and Entrypoint can't be blanked (#34593) 2016-07-12 15:18:53 -04:00
rallytime
640d8bb5b2 Pylint fixes 2016-07-11 14:26:06 -06:00
rallytime
de93203bf5 Remove object.iteritems() call from boto_elasticsearch_domain_test 
Also, clean up imports in that file and remove stray ` character from
boto_apigateway state from previous commit.
 2016-07-11 14:26:06 -06:00
rallytime
2a5dab3c56 Use six.iteritems(object) in boto_s3_bucket module and boto_s3_bucket_test 2016-07-11 14:26:06 -06:00
rallytime
1f21dfc555 Fix unit.states.kmod_test to pass when running in Py3 
The join function adds each list item in different orders, resulting
in a failing state comment comparison. This is inaccurate behavior.
 2016-07-11 14:26:06 -06:00
rallytime
6b7a305a1b Rename dockerio.py unit tests to dockerio_test.py 
These tests have never run automatically because of an incorrect file name.

Added a skipIf on these tests as they are currently non-functioning and the
module they're testing has been deprecated.
 2016-07-11 14:26:06 -06:00
Mike Place
a733b844be Fixup unit test for archive module 2016-07-11 11:59:00 -06:00
rallytime
815c8b38d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-08 10:34:32 -06:00
rallytime
f8a3622be7 Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test 2016-07-07 21:29:36 -06:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
 2016-07-07 13:37:58 -06:00
rallytime
2b307b7ea1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/file.py
  - tests/unit/states/file_test.py
 2016-07-06 09:12:25 -06:00
twangboy
78f7c530bb Remove unit tests, integration tests written 2016-07-05 15:12:34 -06:00
Mike Place
ff83c6d219 Merge pull request #34346 from kraney/boto_sns_topic_absent_state_does_not_remove_associated_subscription_arns 
added an optional parameter into boto_sns absent state to remove all …
 2016-06-30 11:25:57 -07: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
rallytime
f9ab8ba46d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-28 14:26:24 -06:00
Winston Liu
d4c1463cfa added an optional parameter into boto_sns absent state to remove all subscriptions tied to the topic being removed. 2016-06-28 13:16:53 -07:00
Alessandro Ghedini
882c6c9c86 Do not force 'filter' table when flushing 
The "table" argument is already part of the function signature, this means
that flush() will always force the "filter" table even when the user sets
a different one.
 2016-06-28 15:40:50 +01:00
Justin Anderson
4fc44bd2f2 Updated winrepo_test (#34227) 
Due to changes made in https://github.com/saltstack/salt/pull/34004,
specifically the "Universal method for everywhere" addition, we
no longer needed to mock the return values as this gets the correct
path.
 2016-06-23 13:05:49 -04: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
Daniel Hobley
182373344e Moved to using run_all in the absent function 
- Fixed unit tests
 2016-06-17 16:13:38 +02:00
joelc
f16839c83b typo 2016-06-17 08:31:49 -05:00
joelc
ec31f7a7d4 Adds delete functionality to mac_defaults 2016-06-17 08:25:42 -05:00
Thomas S Hatch
5a792caa57 Merge pull request #34068 from jfindlay/disk_capacity 
Add docs and tests to disk state
 2016-06-16 15:18:13 -06:00
Justin Findlay
dca04727b5 states.disk: rewrite unit tests 2016-06-16 12:49:36 -06:00
Nicole Thomas
f546a00dc9 Merge pull request #34025 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-15 15:41:00 -04:00
Loren Gordon
f7fd2962cb Update saltmod tests to use master __opts__ 2016-06-15 14:12:53 -04:00
Justin Findlay
6cbe31e6c2 states.disk: rewrite unit tests 2016-06-13 16:13:40 -06: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
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
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