valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
72,820 Commits 24 Branches 182 Tags 341 MiB
ce2070e2a3
Commit Graph

943 Commits

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