Commit Graph

1368 Commits

Author SHA1 Message Date
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
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
Nicolas Delaby
0d40e1c4f3 Add support for edge case when Cmd and Entrypoint can't be blanked 2016-06-08 10:46:24 +02: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
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
Justin Findlay
87e018af2a states.test.configurable_test_state: add unit tests 2016-06-02 17:20:36 -06: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
Nicole Thomas
74a7b78e00 Merge branch '2015.8' into '2016.3'
Conflicts:
  -   -   -   -   -   -   -   -   - doc/conf.py
2016-05-31 11:02:20 -04:00
twangboy
79bc7195dc Fix unit tests 2016-05-27 11:33:52 -06:00
Andreas Lutro
8abf303183 Add support for kapacitor 0.13 (#33352)
* add support for kapacitor 0.13

* update kapacitor tests
2016-05-19 11:03:03 -07:00
Justin Anderson
012dc882aa Fix boto_vpc_test to work with #32677 (#33214) 2016-05-13 08:22:10 -06:00
rallytime
f2dec459d8 Take the develop version of glusterfs.py state 2016-05-09 11:17:46 -06:00
Andrew Hammond
dd20299087 Refactor ipset tests (#32973)
* remove spurious return

* refactor state.ipset tests

* ipset comments: consistency and correct english

* trim out broken code
2016-05-05 07:31:49 -07:00
Kevin Quinn
581f9d328a Fix 'present' option when used without 'key_type' (#32965) 2016-05-05 07:27:30 -07:00
Justin Anderson
1066063a19 File and User test fixes for 2015.8 on Fedora23 (#33056)
* Fix failing user present test

* Fix file_test.test_symlink failure on 2015.8
2016-05-05 07:05:10 -07:00
Tanoti
a2b5595fad For #31309. If value not supplied only check for existence 2016-05-03 14:22:57 +00:00
Nicolas Delaby
87b70186c3 When move a function to a new namespace, allow to keep original context. (#32943) 2016-04-29 10:48:20 -07:00
rallytime
cbf42a8407 Merge branch '2016.3' into 'develop'
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/batch.py
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/beacons.py
  - salt/states/archive.py
  - salt/states/cmd.py
  - salt/utils/gitfs.py
  - tests/unit/states/cmd_test.py
2016-04-26 14:42:26 -06:00
rallytime
80fcdfb9d8 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/targeting/grains.rst
  - salt/cli/daemons.py
  - salt/exceptions.py
  - salt/minion.py
  - salt/modules/schedule.py
  - salt/scripts.py
  - salt/states/archive.py
2016-04-26 12:07:42 -06:00
rallytime
1fc9de1d04 Add 'file.source_list' mock to archive state unit tests 2016-04-26 10:39:43 -06:00
rallytime
9064d3bbfb Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/states/archive.py
2016-04-25 15:45:17 -06:00
Andrew Hammond
06b7b4fe52 file.retention_schedule state (#32800) 2016-04-25 15:21:13 -06:00
Alejandro Bednarik
af64c95593 Append failed cmd in comments. (#32651)
When onlyif fail, append the message to comment so we know which command
is failing. Only in a list context.

Fixes #32575.
2016-04-22 12:54:58 -06:00
Kai Howelmeyer
20c2cf176b Add max_depth parameter to file.directory, fixes #31989 (#32463) 2016-04-22 10:11:58 -06:00
Erik Johnson
67d0c81184 Support remote sources in a source list (#32691)
* Support remote sources in a source list

This commit modifies the source_list check so that remote sources
(http(s), ftp, etc.) are not fetched more than once. To do so, it
adds the use of ``__context__`` in ``cp.cache_file`` and
``file.source_list`` to prevent multiple fetches of a single file in the
same salt run.

* Update tests

Added __context__ to test cases to reflect usage of __context__, and
also added file.source_list to mocked funcs for archive.extracted unit
test.
2016-04-21 08:37:38 -06:00
Nicole Thomas
9942ea9319 [develop] Merge forward from 2016.3 to develop (#32636)
* Ensure rh_service not used on CloudLinux 7

Add CloudLinux to RHEL-derived distros excluded from rh_service use in osrelease >= 7

* Fix binary search and replace (#32542)

* Don't return None from eval_master (#32555)

Raise an exception instead. Because eval master if returns should return
a tuple.

* redact passwords and hashes from user.present updates

Fixes #32381

* Better log message on minion restart if master couldn't be reached. (#32576)

* Revert PR #32480 and apply #32314 with fixes / documentation (#32558)

* Revert "Fix loop in maint.flo"

This reverts commit 5196cd6a6e5db3c7b1a47b1740881bbd3e87ea3d.

* Revert "Clear VCS fsbackend and git_pillar locks on master start"

This reverts commit 7e3caa9bae1ac4de62db9924374e35a8b826937e.

* Revert "Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks"

This reverts commit 4c2db32419022501eae2a695ec488693e043d189.

* prevent eternal gitfs lock due to process crash

* Use salt.utils.fopen() instead of open()

* Make pid locking work for more than just gitfs

Also, make logging more descriptive, to aid in troubleshooting.

* Add git_pillar_global_lock config option default value

* Document proper usage of {gitfs,git_pillar}_global_lock

* Fix comments value in salt.states.pkgrepo example (#32604)

'comments' option adds '#' automatically. Example contains `#http://mirror.centos.org/centos/$releasever/os/$basearch/` string which becomes prefixed with '##' in generated file.

* alphabetize directories for dynamic modules (#32599)

Also add engines and proxy minions to the list.

* Expand on the open-source vs open-core FAQ

* Language clarification.

* Fix some mistakes in the salt-ssh thin shell script (#32583)

* [[ is bash, not compatible with /bin/sh

* check if python command exists before calling it

* Deprecate 'user' and 'group' in state cmd (#32613)

* Remove unused 'group' argument

* Fix unit testing of cmd.mod_run_check without group arg

* Deprecate 'user/group' in cmd.run

* Deprecate 'user'/'group' in cmd.script

* Deprecate 'user' in cmd.wait

* Deprecate 'user'/'group' in cmd.wait_script

* Fix mod_run_check without 'group'

* Push deprecation back one release

* Fix mac_service and mac_system modules (#32587)

* Fix mac_service module

* Add integration tests for new functions

* Start will not enable the service beforehand

* Remove unused variables
2016-04-18 08:40:20 -06:00
ksvasan
c90bcfe1db Enable blocking on min_party until minimum set of nodes are available (#32592)
* Enable blocking on min_party until minimum set of nodes are available

* Fix the comment in min_party for salt-pr-lint-n

* Add test cases to the min_party method

* Fix the lint issues causing build failure

* Change the comment for test_min_party

* CR comments for modules/zk_concurrency.py

* Adding more examples for blocking/min_nodes

* Change the comment formatting

* Removing space at end of line

* Comments changes to rebuild
2016-04-15 13:35:29 -06:00
Ronald van Zantvoort
c25dffe7a9 Deprecate 'user' and 'group' in state cmd (#32613)
* Remove unused 'group' argument

* Fix unit testing of cmd.mod_run_check without group arg

* Deprecate 'user/group' in cmd.run

* Deprecate 'user'/'group' in cmd.script

* Deprecate 'user' in cmd.wait

* Deprecate 'user'/'group' in cmd.wait_script

* Fix mod_run_check without 'group'

* Push deprecation back one release
2016-04-15 13:30:56 -06:00
rallytime
efe3ec82da Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/glusterfs.py
  - salt/modules/service.py
  - tests/unit/modules/glusterfs_test.py
2016-04-13 16:10:33 -06:00
rallytime
b77993d9a1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/targeting/grains.rst
  - salt/crypt.py
  - salt/scripts.py
  - salt/states/dockerng.py
  - salt/states/pkg.py
2016-04-13 09:42:54 -06:00
Nicolas Delaby
958b2ec749 Fix support of dockerng.volume_present when no volume is on present.
fixes #32493
2016-04-13 15:47:13 +02:00
Nicole Thomas
216d9fdc9a [develop] Merge forward from 2016.3 to develop (#32494)
* fix sorting by latest version when called with an attribute

* remove reference to master_alive_check

* Fixes saltstack/salt#28262

* Resolve memory leak in authentication

* outputter virt_list does not exist anymore

* Update proxmox documentation

* Fix documentation on boto_asg and boto_elb modules and states

* modules.win_timezone: don't list all zones in debug log

* Correcty index glusterfs bricks

Fixes issue #32311

* Cleaner deprecation process with decorators

* Add deprecation decorator scaffold

* Capture type error and unhandled exceptions while function calls

* Aware of the current and future version of deprecation

* Implement initially is_deprecated decorator

* Add an alias for the capitalization

* Fix capitalization easier way

* Remove an extra line

* Add successor name to the deprecation decorator.

* Granulate logging and error messages.

* Implement function swapper

* Raise later the caught exception

* Clarify exception message

* Save function original name

* Remove an extra line

* Hide an alternative hidden function name in the error message, preserving the error itself

* Rename variable as private

* Add a method to detect if a function is using its previous version

* Message to the log and/or raise an exception accordingly to the status of used function

* Log an error along with the exception

* Add internal method documentation

* Add documentation and usage process for decorator "is_deprecated"

* Add documentation and process usage for the decorator "with_deprecated"

* Hide private method name

* Fix PEP8, re-word the error message

* Deprecate basic uptime function

* Add initial decorator unit test

* Rename old/new functions, mock versions

* Move frequent data to the test setup

* Add logging on EOL exception

* Rename and document high to low version test on is_deprecated

* Implement a test on low to high version of is_deprecated decorator

* Add a correction to the test description

* Remove a dead code

* Implement a test for high to low version on is_deprecated, using with_successor param

* Correct typso adn mistaeks

* Implement high to low version with successor param on is_deprecated

* Setup a virtual name for the module

* Implement test for with_deprecated should raise an exception if same deprecated function not found

* Implement test for with_deprecated an old function is picked up if configured

* Correct test description purpose

* Implement test with_deprecated when no deprecation is requested

* Add logging test to the configured deprecation request

* Add logging testing when deprecated version wasn't requested

* Implement test EOL for with_deprecated decorator

* Correct test explanation

* Rename the test

* Implement with_deprecated no EOL, deprecated other function name

* Implement with_deprecated, deprecated other function name, EOL reached

* Add test description for the with_deprecated + with_name + EOL

* Fix confusing test names

* Add logging test to the is_deprecated decorator when function as not found.

* Add more test point to each test, remove empty lines

* Bugfix: at certain conditions a wrong alias name is reported to the log

* Fix a typo in a comment

* Add test for the logging

* Disable a pylint: None will _never_ be raised

* Fix test for the deprecated "status.uptime" version

* Bugfix: Do not yank raised exceptions

* Remove unnecessary decorator

* Add test for the new uptime

* Add test for the new uptime fails when /proc/uptime does not exists

* Rename old test case

* Skip test for the UTC time, unless freeze time is used.

* Fix pylint

* Fix documentation

* Bugfix: proxy-pass the docstring of the decorated function

* Lint fix

* Fixes saltstack/salt#28262 for 2015.5 branch

* Update master config docs

* Improve git_pillar documentation/logging

* Add note about different behavior of top file in git_pillar

* Make log entry for a missing pillar SLS file more accurate for git_pillar

* FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info.

* FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info.

* Update glusterfs_test to be inline with #32312

* Fix salt-cloud paralell provisioning

Closes #31632

* Ignore Raspbian in service.py __virtual__ (#32421)

* Ignore Raspbian in service.py __virtual__

This prevents more than one execution module from trying to load as the
service virtual module.

Refs: #32413

* pack __salt__ before loading provider overrides

We can (and should) pack here since we're just packing a reference to the
object. __salt__ needs to be available when we're loading our provider
overrides

* Fix broken __salt__ dict in provider override

Using ret.items() here sets ``__salt__`` to its items (tuple containing
function name and reference), breaking usage of ``__salt__`` inside
overridden functions.

* Merge #32293 with test fixes (#32418)

* Fix issue #11497

* Remove check for working directory presence in tests

* Fix Domainname introspection

Default value needs to be extracted from the container itself,
because dockerd set Domainname value when network_mode=host.

* Add pgjsonb_queue to queue doc index

* Pylint fixes

* Pass parser options into batch mode

Resolves #31738

* Changed the target file in file.symlink test (#32443)

* Argument name in docs should match actual arg name (#32445)

Fixes #31851

* tests.integration: bypass MacOS TMPDIR, gettempdir (#32447)

Updates 0edd532, 8f558a5.

When logging in as root over `ssh root@host`, `$TMPDIR` and
`tempfile.gettempdir()` are both set to a variation of:
```
/private/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/
```
When logging in as root over `sudo -i`, `$TMPDIR` is unset and
`tempfile.gettempdir()` is set to `/tmp`.

My guess is that the second case is an unintended or uncorrected omision
by Apple as they have introduced the longer, randomized temp path in a
recent version of MacOS.

* Issue #28706: Fix state user.present behavior. (#32448)

- As mentionned in issue #28706, state user.present no longer remove
      user from groups if the keyword 'groups' with empty value '[]' is not
      explicitly set, salt will assume current groups are still wanted.

* tests.integration: fix 4230c8a

* Move the tables of virtual modules to individual documentation pages

* Add new doc pages to toctree

* Add external ref to windows package manager docs

* Improve docstrings

* Add documentation on virtual module provider overrides to the module docs

* Clarify the scope of the provider param in states.

* Add link to provider override docs to all package providers

* Add link to provider override docs to all service providers

* Add link to provider override docs to all user providers

* dd link to provider override docs to all shadow providers

* Add link to provider override docs to all group providers

* Backport 31164 and 31364 (#32474)

* Don't send REQ while another one is waiting for response.

The message has to be removed from the queue the only *after* it's
already processed to don't confuse send() functionality that expects
empty queue means: there's no active sendings.

* Fixed zeromq ReqMessageClient destroy

* Add link to provider override docs to opkg.py

This is a companion to https://github.com/saltstack/salt/pull/32458, but
this module was not added until the 2016.3 branch, so the documentation
is being updated there for this module.

* Add documentation for some master/minion configs (#32454)

Refs #32400

Adds docs for:

- cli_summary
- event_return_queue
- event_return_whitelist
- event_return_blacklist
- file_recv_max_size
- fileserver_followsymlinks
- fileserver_ignoresymlinks
- fileserver_limit_traversal

* Automatically detect correct MySQL password column for 5.7 and fix setting passwords (#32440)

* Automatically detect MySQL password column

* Fix changing password in MySQL 5.7

* Fix lint test

* Fix unit tests (?)

They will still fail if "authentication_string" is legitimately the right column name, but I don't know what to do about that.

* Additional unit test fix

* Only unsub if we have a jid

Closes #32479
2016-04-11 17:07:15 -06:00
rallytime
4f03f2311f Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/win_pkg.py
  - salt/transport/tcp.py
2016-04-11 14:33:21 -06:00
Justin Anderson
116c91e293 Changed the target file in file.symlink test (#32443) 2016-04-08 16:00:15 -06:00
rallytime
7f8eb751a0 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/cli/daemons.py
  - salt/modules/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
2016-04-08 10:09:03 -06:00
rallytime
9531ea6ef5 Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/topics/highavailability/index.rst
  - salt/loader.py
  - salt/modules/service.py
  - salt/states/cmd.py
  - tests/unit/states/cmd_test.py
2016-04-07 16:10:32 -06:00
Nicole Thomas
0809126d8e Merge #32293 with test fixes (#32418)
* Fix issue #11497

* Remove check for working directory presence in tests
2016-04-07 14:55:25 -06:00
Justin Anderson
28ea60f28e Fixes test failure where Fedora 23 has /etc/grub.conf by default 2016-04-07 11:40:12 -06:00
rallytime
760f479424 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/scripts.py
  - salt/state.py
  - tests/unit/config/config_test.py
2016-04-05 15:09:27 -06:00
rallytime
eb6773823b Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/rh_service.py
2016-04-01 10:33:44 -06:00
twangboy
5ca4ad6675 Fix unit tests for state 2016-03-30 17:12:12 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 15:33:13 -06:00
Nicolas Delaby
c989ae5a7e Merge user defined labels with one carried by the image 2016-03-29 11:50:08 +02:00
rallytime
d684d49490 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
2016-03-28 11:16:22 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
2016-03-25 11:47:16 -06:00
rallytime
6886681410 Fix test failures 2016-03-24 16:45:03 -06:00
rallytime
a333210a08 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/conf.py
  - salt/modules/rabbitmq.py
  - salt/states/rabbitmq_user.py
  - tests/unit/states/rabbitmq_user_test.py
2016-03-23 16:10:31 -06:00
Brian Stevenson
1500aae027 set deleted value to list 2016-03-23 13:47:12 -07:00
Brian Stevenson
1dc8f5f289 unit test update
grain value looks for list in assertion
2016-03-23 10:50:32 -07:00
rallytime
fa09de7a58 Merge branch '2015.8' into '2016.3'
Conflicts:
  - tests/unit/states/rabbitmq_user_test.py
2016-03-23 10:56:25 -06:00
Nicole Thomas
37c410fee4 Merge pull request #32079 from rallytime/merge-32041
Merge #32041 with test removal
2016-03-23 09:42:35 -06:00
rallytime
b13fdc1831 Remove useless tests 2016-03-23 08:49:52 -06:00
Stefan Schweer
1ee6e7b04f replaced ',' for whitespace as split seperator for rabbitmq tags
- fixed unit tests
   * fixed test for states.rabbitmq_user.present
2016-03-23 11:55:27 +01:00
Kris Raney
3c6d0e8fc1 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-22 14:49:18 -06:00
Nicole Thomas
9216e303e1 Merge pull request #31961 from kraney/kraney_bugfix
Make sure there are no connection object cache hits on boto_* unit te…
2016-03-22 14:38:46 -06:00