Justin Findlay
7a26c2b5b9
disable pkg.hold test for RHEL/CentOS 5
2015-06-17 16:36:36 -06:00
mattmb
a5607d5e07
Multiple onchanges requisite behaviour
...
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
2015-06-16 15:02:11 +01:00
Colton Myers
5b49e89b43
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
2015-06-12 11:42:42 -06:00
Justin Findlay
d88fb22fdc
fix pkg module integration tests on CentOS 5
2015-06-11 14:56:52 -06:00
Justin Findlay
fb91b40ba0
fix pkg module integration tests on ubuntu 12
2015-06-11 12:46:22 -06:00
Michael Steed
83a96367a4
Manual merge of #24414 per thatch45
2015-06-06 07:47:52 -06:00
Colton Myers
baf4337918
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/lxc.py
salt/roster/clustershell.py
2015-06-03 13:47:08 -06:00
Justin Findlay
c2db0b1758
fix pkg hold/unhold integration test
2015-06-02 11:56:18 -06:00
Colton Myers
a6a868be6b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/iptables.py
salt/utils/dictupdate.py
2015-06-01 10:29:32 -06:00
Justin Findlay
98944d8c7f
fix pkg test on ubuntu 12.04 for realz
2015-05-31 22:23:17 -06:00
Colton Myers
5fcbcfe6d5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/digitalocean.rst
doc/topics/tutorials/index.rst
salt/cloud/clouds/digital_ocean.py
salt/modules/lxc.py
salt/returners/__init__.py
2015-05-29 17:33:28 -06:00
Justin Findlay
9508924c02
fix pkg mod integration test on ubuntu 12.04
2015-05-29 15:52:57 -06:00
Colton Myers
9dab9a1dda
Fix python3 lint
2015-05-27 13:07:47 -06:00
Colton Myers
60f2e9eefb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/development/contributing.rst
salt/modules/tls.py
2015-05-26 16:38:42 -06:00
Justin Findlay
f1bd5ec404
adding pkg module integration tests
2015-05-23 19:34:37 -06:00
Colton Myers
4ea3f8f80a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/pillar/neutron.py
salt/utils/http.py
2015-05-15 13:43:40 -06:00
Justin Findlay
b8867a8c23
update pip tests
2015-05-15 00:15:26 -06:00
Justin Findlay
9ea2f477b9
more than ZMQ supported for transport, other typos
2015-05-04 23:24:46 -06:00
Colton Myers
1a38b4b834
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cli/salt.py
salt/client/mixins.py
salt/renderers/pyobjects.py
2015-04-22 11:07:01 -06:00
Thomas Jackson
98af7c3f95
Cleanup jinja attribute access for loader
...
Refactor of #22723
2015-04-21 22:39:17 -07:00
Colton Myers
bd6ecdfd43
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/gitfs.rst
salt/pillar/pepa.py
salt/states/artifactory.py
salt/states/pip_state.py
salt/transport/__init__.py
2015-04-21 10:42:22 -06:00
Colton Myers
92c51affc5
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-21 10:33:39 -06:00
Pedro Algarvio
ae2bca1f6f
Fix W1504(unidiomatic-typecheck
2015-04-21 14:02:17 +01:00
Pedro Algarvio
b62df62151
Don't assume package installation order.
...
Additionally pep8 when installed using wheel, reports the version
together with the name.
2015-04-20 14:45:25 +01:00
Colton Myers
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Thomas S Hatch
f8cdc5060e
fix sysdoc tests for new module level hooks
2015-04-15 19:42:23 -06:00
Colton Myers
cc8785e980
Fix the test.fib tests
2015-04-11 14:48:59 -04:00
Colton Myers
0b7ac988cc
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
salt/beacons/service.py
salt/beacons/sh.py
salt/modules/cassandra_cql.py
salt/returners/cassandra_cql_return.py
2015-04-01 14:22:33 -06:00
Colton Myers
ed51f2bb7c
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-03-31 11:25:27 -06:00
Joshua Semar
a5b28ad24d
fix tests return value
2015-03-30 16:42:19 -05:00
Joshua Semar
95aa3518d5
fix cas behavior on data module
...
data.cas was not saving changes. We now call dump after
receiving the change
2015-03-30 16:01:28 -05:00
Colton Myers
bdfdd3f232
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/virt.py
2015-03-11 16:09:57 -06:00
Thomas S Hatch
13b7046227
Merge pull request #21461 from jfindlay/refactor_crons
...
Refactor unix crons
2015-03-11 09:52:28 -06:00
Erik Johnson
d25677e954
Merge branch '2015.2' into 2015.2-develop
2015-03-10 17:47:30 -05:00
Justin Findlay
5dc09e7da1
update cron and cmd tests for cron runas changes
2015-03-10 15:57:24 -06:00
Vincent Desjardins
d5293901bc
fixes #20198 : virt.get_graphics and virt.get_nics calls in module virt
2015-03-10 09:17:48 -06:00
Vincent Desjardins
7e517a6a5a
fixes #20198 : virt.get_graphics and virt.get_nics calls in module virt
2015-03-09 22:10:38 -04:00
Colton Myers
d17c908b42
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/pillar/index.rst
salt/beacons/diskusage.py
salt/beacons/network_info.py
salt/minion.py
salt/modules/iptables.py
salt/modules/nacl.py
salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
Colton Myers
8c1fa5358e
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/debian_ip.py
salt/modules/file.py
salt/states/ssh_auth.py
salt/utils/cloud.py
2015-03-09 11:50:21 -06:00
Thomas Jackson
9fa37fd46b
Add raw boolean support to depends decorator
2015-03-05 21:59:10 -08:00
Erik Johnson
0a077c14e3
Update test_valid_docs for nspawn compatibility funcs
2015-03-03 10:10:50 -07:00
Thomas S Hatch
17a76a8e86
Merge pull request #21083 from cachedout/request_test
...
Fix error in state.request
2015-03-03 10:00:14 -07:00
Justin Findlay
a6b86ef627
indent quoted code in cmdmod tests
2015-03-02 16:08:49 -07:00
C. R. Oldham
f171df4311
Merge forward 2015.2->develop
2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060
Merge forward 2014.7->2015.2
2015-03-01 17:55:25 -07:00
Erik Johnson
94d55889d7
Resolve merge conflicts
2015-02-28 12:35:25 -06:00
Erik Johnson
5573b18624
Fix more py3-incompatible print statements
2015-02-28 12:15:16 -06:00
Erik Johnson
93e1805c14
Lint fix
2015-02-28 12:13:41 -06:00
Erik Johnson
84de5b23af
Merge pull request #21160 from terminalmage/lint-2015.2
...
Don't use print statement without parenthesis (py3 compat)
2015-02-28 11:49:13 -06:00
Erik Johnson
afb8439c1f
update test_valid_docs
2015-02-28 11:47:12 -06:00
Erik Johnson
86937eedc4
Don't use print statement without parenthesis (py3 compat)
...
This backports a lint fix from #21158 into the tests for 2015.2.
2015-02-28 11:41:51 -06:00
Justin Findlay
17b8f73f1b
add cmd module integration tests
2015-02-27 16:30:05 -07:00
Justin Findlay
3397dc5540
fix state request tests
2015-02-27 16:15:26 -07:00
Justin Findlay
68f06aae51
add integration test for #18317
2015-02-27 14:53:53 -07:00
Justin Findlay
3b7ba92089
adding cmd.run integration tests
2015-02-27 14:53:53 -07:00
Justin Findlay
581247f4b5
fix ssh test error
...
introduced by #21006
2015-02-25 15:27:03 -07:00
Justin Findlay
5dace8f688
add integration test for #18317
2015-02-24 16:25:57 -07:00
Justin Findlay
5ab5380094
adding cmd.run integration tests
2015-02-23 16:35:07 -07:00
Colton Myers
c8eb2d4665
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
salt/cloud/clouds/joyent.py
salt/daemons/flo/core.py
salt/minion.py
2015-02-23 14:25:51 -07:00
Colton Myers
c3b7be0655
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/installation/rhel.rst
salt/output/__init__.py
salt/utils/__init__.py
2015-02-20 13:51:59 -07:00
rallytime
c3f786c966
listen and listen_in requisite tests
2015-02-19 16:13:23 -07:00
rallytime
1437c9a1f5
onfail and onfail_in requisite tests
2015-02-19 14:35:26 -07:00
rallytime
208b4906d8
Onchanges and onchanges_in requisite tests!
2015-02-19 13:06:38 -07:00
rallytime
8f0e80bd66
Add one onchanges requisite test
2015-02-18 17:16:07 -07:00
Colton Myers
f00465a8a1
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/event/index.rst
salt/loader.py
salt/modules/config.py
salt/modules/cyg.py
salt/modules/hg.py
salt/modules/lxc.py
salt/modules/upstart.py
salt/states/hg.py
salt/utils/cloud.py
salt/utils/dictupdate.py
salt/utils/schedule.py
tests/integration/fileserver/gitfs_test.py
tests/unit/pydsl_test.py
2015-02-18 11:55:29 -07:00
Justin Findlay
b39f962369
add state module requested state run tests
...
closes #16901
2015-02-17 14:23:14 -07:00
Erik Johnson
706ce858b4
Disable LXC integration tests for now
2015-02-10 15:06:47 -06:00
Erik Johnson
f18a23c284
Ignore lack of CLI example in deprecated function
2015-02-10 15:06:47 -06:00
Pedro Algarvio
ac15f12349
Py3 compatibility
2015-01-30 22:27:10 +00:00
Pedro Algarvio
4a25daa211
Py3 compatibility
2015-01-30 22:27:10 +00:00
Pedro Algarvio
5dab3e0d7d
Py3 compatibility fixes.
2015-01-30 22:25:29 +00:00
Pedro Algarvio
e6ab1d4ba1
Fix import
2015-01-30 22:25:19 +00:00
Pedro Algarvio
403abc88e1
Py3 compatibility fixes
2015-01-30 22:25:10 +00:00
Pedro Algarvio
91d185153c
Py3 compatibility fixes
2015-01-30 22:25:10 +00:00
Pedro Algarvio
5d570561fd
Py3 compatibility fixes
2015-01-30 22:25:10 +00:00
Pedro Algarvio
665127c932
Py3 compatibility fixes
2015-01-30 22:25:10 +00:00
Pedro Algarvio
fda912f2d8
Py3 compatibility fixes
2015-01-30 22:25:10 +00:00
Pedro Algarvio
7360164558
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
fcd9832863
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
ec93519312
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
f07427a0ed
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
b54c02930f
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
a4e48e8873
Py3 compatibility fixes
2015-01-30 22:25:05 +00:00
Pedro Algarvio
dd146ca3e5
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
rallytime
69d7a6ebd0
Pylint fixes for the 2015.2 branch
2015-01-23 10:57:18 -07:00
Thomas S Hatch
9cdbf2b2f7
Merge pull request #19972 from rallytime/bp-19746
...
Backport #19746 to 2015.2
2015-01-22 17:55:27 -07:00
Mathias Gug
dd097b730d
Fix style issues.
2015-01-22 14:40:49 -07:00
Mathias Gug
4542072c4e
Add boto_sns module and state.
...
Include integration tests.
2015-01-22 14:40:32 -07:00
Mathias Gug
a454d71bd5
Fix coding style.
2015-01-22 14:24:30 -07:00
Mathias Gug
adf4c7a1af
Skip boto_iam integration tests if boto is not available
...
or properly configured.
2015-01-22 14:24:30 -07:00
Mathias Gug
6a18c71f1d
Add comment.
2015-01-22 14:24:29 -07:00
Mathias Gug
0d158cfa12
Add get_account_id function boto_iam
...
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
2015-01-22 14:24:29 -07:00
Mathias Gug
85ec021a73
Merge remote-tracking branch 'upstream/develop' into support-sns-subscriptions
...
Conflicts:
tests/integration/states/boto_sns.py
2015-01-22 11:11:51 -08:00
Mathias Gug
b79756bdd5
Support subscriptions in sns topic state.
2015-01-22 11:04:31 -08:00
Pedro Algarvio
b0920b226e
We still support Python 2.6, so, we need indexes.
2015-01-21 02:11:48 +00:00
Thomas S Hatch
8bfb79c8d9
Merge pull request #19812 from matthew-muscat/develop
...
Update hosts file creation for consistency and improved readability
2015-01-20 14:52:01 -07:00
Matthew Muscat
f44d67471d
Update hosts module test
...
Update test case to account for formatting changes in b82001fcd4
2015-01-18 00:33:00 +11:00
Mathias Gug
e5ab359bdd
Fix style issues.
2015-01-14 16:02:50 -08:00
Mathias Gug
6f9fbe23d6
Add boto_sns module and state.
...
Include integration tests.
2015-01-14 15:43:06 -08:00
Mathias Gug
97d0f93fd3
Fix coding style.
2015-01-14 13:06:43 -08:00
Mathias Gug
30625a0437
Skip boto_iam integration tests if boto is not available
...
or properly configured.
2015-01-14 11:49:54 -08:00
Mathias Gug
61eeac5465
Add comment.
2015-01-14 11:12:23 -08:00
Mathias Gug
3ff36a9692
Add get_account_id function boto_iam
...
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
2015-01-14 11:08:54 -08:00
Mike Place
cba0d6d597
Fix tests
2015-01-12 16:01:10 -07:00
Colton Myers
3ce5eb2838
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/archive.py
salt/modules/brew.py
salt/modules/pip.py
tests/unit/modules/archive_test.py
tests/unit/modules/pip_test.py
2015-01-09 11:39:09 -07:00
rallytime
ea769829af
Fix my pylint errors
2015-01-08 15:09:55 -07:00
rallytime
41841701e7
Fix djangomod.py integration test failures
2015-01-08 12:57:11 -07:00
Colton Myers
a60fa6b3d1
Merge branch '2015.2' into develop
2015-01-08 11:29:08 -07:00
rallytime
74a1861655
Merge branch '2015.2' into merge_forward_develop
2015-01-07 17:01:25 -07:00
Colton Myers
70489c62a7
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/cron.py
salt/modules/rabbitmq.py
salt/modules/smf.py
salt/modules/upstart.py
salt/modules/useradd.py
salt/modules/zpool.py
salt/pillar/git_pillar.py
2015-01-07 14:49:58 -07:00
rallytime
4e87557748
--local is not available in older versions of git
...
Also adjust the tests:
subprocess.check_output is only available in python 2.7
2015-01-07 11:56:43 -07:00
rallytime
194c0696aa
Fix my pylint errors
2015-01-06 17:27:38 -07:00
Seth House
e96654744f
Added test for git_pillar branch to env mappings
2015-01-06 16:51:58 -07:00
rallytime
ed3a34624c
Fix djangomod.py integration test failures
2015-01-06 22:26:46 +00:00
Colton Myers
f6eae029f0
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
pkg/windows/installer/Salt-Minion-Setup.nsi
salt/grains/core.py
salt/minion.py
salt/modules/mongodb.py
salt/states/archive.py
salt/states/mount.py
salt/utils/master.py
salt/utils/schedule.py
salt/utils/thin.py
tests/jenkins-ng.py
2015-01-06 13:14:27 -07:00
rallytime
57514d824b
Fix pylint on 2014.7 branch
2015-01-03 21:44:09 -07:00
Justin Findlay
4748156ed9
update cmdmod integration tests
2014-12-23 13:59:25 -07:00
Mike Place
67150306b6
Fix version test
2014-12-15 13:13:42 -07:00
Pedro Algarvio
a985f0ac4e
Disable some Pylint errors
2014-12-01 03:23:52 +00:00
Pedro Algarvio
14cc8931ed
Disable some Pylint errors
2014-11-28 15:30:05 +00:00
Pedro Algarvio
bfe99dbb3f
Merge branch '2014.7' into develop
...
Conflicts:
salt/cloud/__init__.py
salt/modules/file.py
salt/modules/zcbuildout.py
salt/runners/lxc.py
salt/runners/manage.py
2014-11-26 20:14:56 +00:00
Pedro Algarvio
2a597da207
Switch open() for salt.utils.fopen()
2014-11-26 17:47:05 +00:00
Pedro Algarvio
6b72255e9b
Switch open() for salt.utils.fopen()
2014-11-26 17:46:13 +00:00
Pedro Algarvio
a802d8f7f5
Use the skip_if_binaries_missing_helper
2014-11-20 16:40:38 +00:00
rallytime
e70537eb2c
Fix missing cls variable and add some docstring info
2014-11-20 09:15:56 -07:00
Jonathan Ballet
a6c3499749
Please pylint
...
My patch #18221 yesterday introduced new Pylint warnings/errors.
This fixes these warnings.
2014-11-19 19:28:28 +01:00
Thomas S Hatch
873d1c1803
Merge pull request #18221 from multani/fix/git-config-set-shell-escape
...
Fix Git's config set with values containing white spaces.
2014-11-18 17:14:43 -07:00
Jonathan Ballet
97959959ca
Add future's absolute import to fix importation of git in tests
...
Tests in pillar.py are importing the "git" module, which is supposed to
be "GitPython", bt since Python 2.x doesn't use absolute import by
default, it imports the "git" submodule, which defines the tests for the
Git module of Salt, instead.
2014-11-18 22:46:35 +01:00
Jonathan Ballet
38bb70d398
Fix Git's config set with values containing white spaces.
...
The Salt function 'git.config_set' and the state 'git.config' (which relies
on the former) don't escape the value to be set in the configuration file
passed by Salt. For example, this doesn't work:
mylocalrepo:
git.config:
- name: user.name
- value: "Jonathan Ballet"
- repo: file://my/path/to/repo
This set the 'user.name' configuration value to "Jonathan" only.
(Additionally, the state discovers that the value set is not the one
specified, and keeps trying to set the right value, which ends up with lot
of "name = Jonathan" into the "[user]" section of Git's config file.)
This commit fixes the problem and adds some unit tests to verify it's
working properly.
2014-11-18 20:02:24 +01:00
rallytime
652d4b4803
Fix up the linux_acl test that is failing
2014-11-14 15:40:12 -07:00
Chris Rebert
478e406001
replace salt._compat.string_types with six.string_types
2014-11-11 13:45:52 -08:00
Roman Inflianskas
fb5e86aaa1
modules.linux_acl: satisfy pylint
2014-11-04 16:17:35 +03:00
Roman Inflianskas
83b760db44
modules.linux_acl: add integration tests
2014-11-04 14:45:23 +03:00
Colton Myers
0cc0d64136
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/hg.py
2014-10-31 16:14:34 -06:00
Thomas Jackson
6262d44d50
Add "normalize_ret" function, so we don't have to copy/paste so much
...
Add checks for "changes" since we want to test cases where there aren't changes to be made
2014-10-30 16:58:03 -07:00
Thomas Jackson
d2b548a0e7
Add regression test for #17051
2014-10-30 16:43:06 -07:00
Thomas Jackson
6612aa808e
Revert spelling fix, since its a variable name :)
2014-10-29 13:56:44 -07:00
Thomas Jackson
aabe6460f6
Misc comment cleanup in tests
2014-10-28 08:12:10 -07:00
Thomas S Hatch
5ab6743b85
Merge branch '2014.7' into develop
2014-10-13 20:06:17 -06:00
Pedro Algarvio
e739561728
Use the salttesting skip helpers
2014-10-08 01:02:10 +01:00
Thomas S Hatch
0a094e2c43
Merge pull request #15104 from srkunze/feature/safe_env
...
Made safe environment copy
2014-09-08 14:48:58 -06:00
Sven R. Kunze
d294e95cf5
fixed test_os_environment_remains_intact
2014-09-05 12:20:08 +02:00
Antoine Jacoutot
1ef276575f
tests: recognize OpenBSD
2014-09-04 10:23:59 +02:00
Thomas S Hatch
ab1c6bcf27
One more test fix
2014-09-03 08:43:52 -06:00
Thomas S Hatch
b95d575e52
Fix tests for new changes from PR #15217
2014-09-02 17:39:50 -06:00
rallytime
b8db5ff56b
Change lxc skipIf message to be more helpful
2014-08-15 14:21:09 -06:00
rallytime
396a4de7c5
Make lxc tests run!
2014-08-15 11:09:20 -06:00
rallytime
7f170c126f
Remove 'RC1' from GIT_VERSION comparison
2014-08-14 11:06:18 -06:00
rallytime
fe5b8d22ec
Fix gitpillar skipIfs
2014-08-14 10:34:38 -06:00
