valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,952 Commits 24 Branches 182 Tags 341 MiB
ee493bae47
Commit Graph

635 Commits

Author SHA1 Message Date
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
 2016-03-02 13:48:11 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
rallytime
40cd0ac8fe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/runtests.py
 2016-02-25 16:21:15 -07:00
Ch3LL
29a53f4353 rename methods in pkg states test 2016-02-26 06:54:01 +09:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
 2016-02-25 12:36:22 -07:00
Ch3LL
a387d175d8 integartion test- ensure decorator only runs on one method and not entire class 2016-02-25 01:55:35 +09:00
rallytime
38f89bf8fd Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
 2016-02-21 15:23:24 -07:00
Mike Place
3832f9b874 Merge pull request #30979 from dschaller/npm-cache-clean 
Adding NPM cache_cleaned state & module functions
 2016-02-18 14:51:04 -07:00
Mike Place
b40c611d0d Merge pull request #31067 from jfindlay/deprecate_env 
Deprecate env
 2016-02-18 14:42:10 -07:00
rallytime
cc29092dcb Merge branch '2016.3' into 'develop' 2016-02-18 11:33:24 -07:00
rallytime
7ea9dacbdd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
 2016-02-18 11:10:44 -07:00
Ch3LL
da9bca625e pkg.latest epoch test for 2016 2016-02-17 09:51:11 -07:00
Justin Findlay
728f4e6c05 tests/integration/states/compiler.py: remove env support 2016-02-16 20:33:23 -07:00
Mike Place
c5e5af827c Merge pull request #31171 from Ch3LL/megan-20158 
added logic to check for installed package
 2016-02-12 15:10:21 -07:00
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
 2016-02-12 14:38:50 -07:00
Ch3LL
9204e3f562 add integration test for issue 30934w 2016-02-12 12:21:50 -07:00
Ch3LL
a12e2f566b fix lint error 2016-02-12 11:38:29 -07:00
Ch3LL
a123efd4ef added logic to check for installed package 2016-02-12 11:01:35 -07:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
Mike Place
b831e0a865 Merge pull request #31131 from Ch3LL/megan-20158 
integration test for issue #31014
 2016-02-11 10:33:23 -07:00
Ch3LL
af82b1233a integration test for issue #31014 2016-02-10 21:46:22 -07:00
rallytime
742d0a6b04 Change all relevant Boron references to 2016.3.0 
And more Boron deprecation warnings to Carbon
 2016-02-10 15:45:28 -07:00
justinta89
a5eac47b25 Changed npm integration test to install request. 
Later versions of npm were having trouble installing pm2 with the git link.
 2016-02-10 14:31:16 -07:00
Colton Myers
67e17b3022 Revert "Deprecated code removed. " 2016-02-10 11:40:48 -07:00
justinta89
56efb2d06a File state born deprecations. 
Backport of #30988
 2016-02-08 10:13:15 -07:00
abednarik
b20738a5a1 File state born deprecations. 
Removed all Boron warning and deprecated code.
 2016-02-08 10:01:28 -03:00
Derek Schaller
de154d76ce Adding npm cache_cleaned state and required module functions 2016-02-06 15:27:00 -08:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
Colton Myers
117fb205de Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    tests/unit/modules/boto_vpc_test.py
 2016-01-21 14:37:32 -07:00
Justin Findlay
66f06f2bd3 disable pkgrepo test for ubuntu 15.10+ 2016-01-21 10:55:37 -07:00
justinta89
64a62662ef Added sys import 2015-11-19 14:42:15 -07:00
Justin Findlay
401e4bfd33 file state: integration test difflib version check 2015-11-19 14:10:29 -07:00
justinta89
f947e1e549 Adjusted the expected output to match the actual results 2015-11-19 11:32:18 -07:00
Colton Myers
6537da77fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/grains/core.py
    salt/loader.py
    salt/minion.py
    salt/modules/dockerng.py
    salt/modules/rest_package.py
    salt/modules/ssh.py
    salt/modules/state.py
    salt/modules/timezone.py
    salt/modules/zypper.py
    salt/runners/state.py
    salt/state.py
    salt/states/virtualenv_mod.py
    salt/utils/cloud.py
 2015-10-13 17:27:48 -06:00
Jonathan Ballet
6d95cbc998 Fix lint errors 2015-10-07 17:49:07 +02:00
Jonathan Ballet
4ff9f4be2a Fix file.directory with clean=true and require_in with states ID 
In order to know which files need to be cleaned up, a file.directory state
looks at its requirements.
Previously, it only looked at the name attribute of the required state and
supposed it was the name of the file to keep within this directory. It's
not completely right, as a requirement can also be made against a state ID,
in which case the 'name' attribute of the required state then have to be
used.

Fix #8646
 2015-10-07 14:53:04 +02:00
Jonathan Ballet
0d391275de Test cases to demonstrate bug #8646 2015-10-07 12:06:35 +02:00
Matti Niemenmaa
8eb5036f1f states.file: allow prepending to non-existent file (#27401) 
Remove the redundant file.touch invocation also from file.append, to
simplify the flow.
 2015-09-27 09:06:51 +03:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
Erik Johnson
37c8852584 Update git.config_set tests to use new state name 2015-09-02 20:58:06 -05:00
Erik Johnson
b401328558 tests/integration/states/ssh.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
8053d1f952 tests/integration/states/mysql.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -06:00
Andreas Lutro
2f55d60293 git.latest: add test for no rev 
technically, rename existing test and add a new simpler test with the
old name.
 2015-08-18 16:38:24 +02:00
Colton Myers
f3c8ba85dc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/modules/systemd.py
    salt/utils/aws.py
 2015-08-17 17:06:59 -06:00
Mike Place
35d6ae2be7 Use with 2015-08-12 12:14:12 -06:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
 2015-08-10 13:27:31 -06:00
Thomas S Hatch
2ddf5c4e58 lint 2015-08-08 20:17:45 -06:00
Thomas S Hatch
912d6041f5 apply @cachedout's tests 2015-08-08 09:37:16 -06:00
Mike Place
bbc6f84c75 Merge pull request #26105 from cachedout/fix_25221 
Fix failing test
 2015-08-07 12:11:10 -06:00
Mike Place
1a18013330 Fix failing test 2015-08-07 12:10:40 -06:00
Mike Place
c5e1f5bee6 Merge pull request #25221 from jet9/istextfile_utf8 
Extend salt.utils.istextfile() with detection of utf-8 content instead of binary
 2015-08-07 12:10:27 -06:00
Andreas Lutro
ceda2b7274 users: integration test for empty GECOS fields 2015-08-07 09:25:21 +02:00
Dmitry Kurbatov
2a349ff102 Extend salt.utils.istextfile() with utf-8 instead of binary detection 2015-08-07 10:06:20 +03:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Jason Hamner
24f653e963 Integration Test for Issue 25250 
Adds integration test for #25250
 2015-07-24 13:28:15 -06:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
Pedro Algarvio
c4b15840c6 Additional test case for question raised in #1846 
https://github.com/saltstack/salt/issues/1864#issuecomment-102246258
 2015-07-15 14:29:43 +01:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Justin Findlay
6f238e924c integration test file.managed sources 2015-06-30 14:26:59 -06:00
Doug Luce
6fe47ea1f4 Allow URL specification of NPM packages 
If an NPM package was specified as a
url (i.e. git://github.com/Unitech/pm2), the state would crash with an
IndexError.  Assume that not every package installed globally is
specified with a URL.

Example failing state:

kvsio:
  npm.installed:
      - name: git+ssh://github.com/dougluce/kvs.io.git
 2015-05-26 13:19:17 -07:00
Justin Findlay
f58f3dac1d integration test for char escaping in file paths 2015-05-04 23:24:45 -06:00
Colton Myers
313c46501d Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/auth/pam.py
    salt/modules/boto_route53.py
    salt/state.py
 2015-04-24 10:19:03 -06:00
Colton Myers
63119f9505 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    salt/modules/dockerio.py
    salt/modules/localemod.py
    salt/modules/useradd.py
 2015-04-22 10:51:49 -06:00
Thomas S Hatch
a178d444b8 Merge pull request #22946 from s0undt3ch/2014.7 
Test with a more recent pip version to avoid a traceback
 2015-04-22 10:25:17 -06:00
Pedro Algarvio
bc87749e2c Test with a more recent pip version to avoid a traceback 
```
07:39:05,449 [salt.minion                                :1178][ERROR   ] A command in 'pip.list' had a problem: Traceback (most recent call last):
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/bin/pip", line 9, in <module>
    load_entry_point('pip==1.3.1', 'console_scripts', 'pip')()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 546, in load_entry_point
    return get_distribution(dist).load_entry_point(group, name)
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2666, in load_entry_point
    return ep.load()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2339, in load
    return self.resolve()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2345, in resolve
    module = __import__(self.module_name, fromlist=['__name__'], level=0)
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/__init__.py", line 13, in <module>
    from pip.commands import commands, get_similar_commands, get_summaries
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/__init__.py", line 6, in <module>
    from pip.commands.bundle import BundleCommand
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/bundle.py", line 5, in <module>
    from pip.commands.install import InstallCommand
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/install.py", line 5, in <module>
    from pip.req import InstallRequirement, RequirementSet, parse_requirements
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/__init__.py", line 3, in <module>
    from .req_install import InstallRequirement
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/req_install.py", line 20, in <module>
    import pip.wheel
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/wheel.py", line 23, in <module>
    from pip.exceptions import InvalidWheelFilename, UnsupportedWheel
ImportError: cannot import name InvalidWheelFilename
```
 2015-04-22 16:13:58 +01:00
Viet Hung Nguyen
b13db32fde add test for #18843 2015-04-22 16:21:23 +07:00
rallytime
1e4b93dec9 Python 3 compat fixes for develop 2015-04-17 12:00:01 -06: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
586b81b33e Add tests for the jinja demands 2015-04-15 16:39:08 -06:00
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
 2015-04-07 10:05:35 -06:00
Justin Findlay
56364ff571 adding cmd.run state integration tests 2015-04-06 20:32:22 -06:00
Pedro Algarvio
ff4aa5b989 Include unless in the state internal keywords. 
Fixes #22359
 2015-04-05 01:00:08 +01:00
Erik Johnson
d25677e954 Merge branch '2015.2' into 2015.2-develop 2015-03-10 17:47:30 -05: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
Viet Hung Nguyen
2a845989b7 bugfix: fix test mode in ssh_known_hosts 
- present func: should not require key/fingerprint.
  In normal mode, key AND fingerprint can be omitted but
  test mode requires them, so fix the test mode to behave same
  way.
- absent function: return correct ret when change suppose to be made.
- refactor a bit.
 2015-03-07 00:58:32 +07:00
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00:00
Dennis Hall
478f42d9b2 Change Github to GitHub 2015-02-15 15:19:54 +01:00
Pedro Algarvio
ff636249f4 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
6b0c88e3bf Py3 compatibility 2015-01-30 22:27:05 +00:00
Pedro Algarvio
79be964dc2 We need to write something, even an empty string 2015-01-30 22:25:19 +00:00
Pedro Algarvio
b791dd6971 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
81ae50fac0 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
fdc467b587 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
f59d669a58 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
4eadb88bfa Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
0577610258 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
Colton Myers
c4da7bdd64 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/client/mixins.py
	salt/daemons/flo/__init__.py
 2015-01-26 19:44:59 -07:00
Mike Place
09d3d62174 Loosen test constraint and update runas arg 2015-01-24 03:16:50 +00:00
Mike Place
e7d959b6a5 Even MORE test fixing 2015-01-24 03:16:50 +00:00
Mike Place
7222d741de Even more pip test fixing 2015-01-24 03:16:50 +00:00
rallytime
69d7a6ebd0 Pylint fixes for the 2015.2 branch 2015-01-23 10:57:18 -07:00
Mathias Gug
4670988a68 Fix style. 2015-01-22 14:41:05 -07:00
Mathias Gug
3b285798e3 Fix style. 2015-01-22 14:40:58 -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
f4c75375f4 Make sure boto_sns state is idempotent. 2015-01-22 12:13:33 -08: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
8dbb7394b2 White-space lint fix 2015-01-21 14:17:03 +00:00
Thomas S Hatch
fab600add9 Merge pull request #19746 from lyft/add-boto-sns-module 
Add boto_sns module and state.
 2015-01-16 16:58:09 -07:00
Chris Rebert
19e262bb7b Fix typos with the help of https://github.com/vlajos/misspell_fixer 2015-01-16 13:35:47 -08:00
Mathias Gug
64cf74ebaa Fix style. 2015-01-14 16:05:36 -08:00
Mathias Gug
6ffc9f827e Fix style. 2015-01-14 16:04:25 -08: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
Mike Place
fc9a647a3b Remove assert: 2015-01-12 18:53:56 -07:00
Mike Place
cba0d6d597 Fix tests 2015-01-12 16:01:10 -07:00
Pedro Algarvio
9d0fe5b1d1 Merge branch '2014.7' into 2015.2 
Conflicts:
	salt/modules/brew.py
	tests/integration/__init__.py
 2015-01-11 22:40:16 +00:00
rallytime
d6b3f69c19 Cleaner and actual fix for the failing weird pip test for CentOS 5 2015-01-09 13:10:09 -07:00
rallytime
28cb062697 Cleaner and actual fix for the failing weird pip test for CentOS 5 2015-01-09 10:52:55 -07:00
Mike Place
ca9a871d43 Merge pull request #19536 from rallytime/pip_test_fix 
Don't run weird pip install test on CentOS 5
 2015-01-08 12:21:08 -07:00
rallytime
71ef3f7744 Keep package name the same 2015-01-08 12:13:26 -07:00
rallytime
a0f801f475 Skip this test when we are running on centOS 5 2015-01-08 12:11:51 -07:00
rallytime
5490530504 Change the install package to fix pip tests 2015-01-08 09:32:53 -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
fe4fd7a5a3 Use skip_if_binaries_missing decorator 2015-01-07 10:11:26 -07: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
f6243f0b80 Fix the test in the correct place... 2015-01-05 15:36:45 -07:00
rallytime
4a62c2b860 Fix pip state test failure 2015-01-05 15:20:18 -07:00
Mike Place
7ff6c22b9b Remove deprecated tests 2014-12-19 11:37:56 -07:00
Colton Myers
43df12b6cc Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/client/ssh/shell.py
	salt/modules/file.py
	tests/integration/states/file.py
 2014-12-18 10:32:19 -07:00
Elias Probst
a2e52dd5fc Fix tests for #18841. 2014-12-18 01:51:08 +01:00
Elias Probst
6363aa22ac Add integration tests for 'modules.file.replace()'. 2014-12-17 12:06:58 +01: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
89befb8827 Switch open() for salt.utils.fopen() 2014-11-26 18:02:24 +00:00
Pedro Algarvio
b5cda75a8c Switch open() for salt.utils.fopen() 2014-11-26 18:01:35 +00:00
Pedro Algarvio
ea717d2422 Switch open() for salt.utils.fopen() 2014-11-26 17:59:52 +00: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
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
Mike Place
c1c9245e89 Fixup test failures 2014-10-28 11:29:59 -06:00
Mike Place
e18190bc04 remove sed test 2014-10-27 18:22:18 -06:00
Erik Johnson
ff6a228746 Remove reference to nonexistant function in pkg tests 
This fixes a ref that was missed in 7984a8c.
 2014-08-27 13:52:36 -05:00
Seth House
11f4e20bd8 Fix incorrect call to state.single in npm pkgs test 2014-08-11 11:03:00 -04:00
Seth House
ed4bb5119e Added pkgs support to the npm module/state 2014-08-07 12:36:39 -04:00
rallytime
6be33dcdc9 Change install package to help Arch tests pass 2014-08-05 14:35:32 -06:00
C. R. Oldham
253de7a995 PyLint fix. 2014-07-25 12:48:07 -06:00
C. R. Oldham
f53e477735 Merge commit, resolve conflict 2014-07-25 11:16:22 -06:00
C. R. Oldham
c94808689d Extend dot-in-pkg test to RHEL 5 as well 2014-07-25 10:57:18 -06:00
Thomas S Hatch
288e9bba29 TABS?!?!? Really @cro ?? 2014-07-25 10:39:19 -06:00
C. R. Oldham
b6f70ac80f Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:09:52 -04:00
Erik Johnson
2939eaec15 Clean up filehandle usage in file state tests 
This does a few things:

1. Change calls to open() to use salt.utils.fopen()

2. Use with blocks where applicable
 2014-07-14 21:23:06 -05:00
Erik Johnson
f847bae5a2 Add tests for templating local files 2014-07-14 21:23:06 -05:00
Mike Place
a08849c270 Remove old-style env= tests. 2014-07-14 11:03:03 -06:00
Pedro Algarvio
5283fa661e Adapt tests to behaviour introduced in #13333 2014-06-10 03:00:19 +01:00
Pedro Algarvio
0b6776ad81 Maintain old test behaviour(no new lines added) 2014-06-10 02:32:22 +01:00
Pedro Algarvio
df3e06ddd7 Test needs root perms 2014-06-10 01:56:24 +01:00
Pedro Algarvio
c6aa49c325 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:26:40 +01:00
Pedro Algarvio
7bd8b1360f Remove remaining exsel code 2014-05-29 01:32:54 +01:00
Thomas S Hatch
b20462ad3f Merge pull request #13037 from terminalmage/npm-test 
add test for npm.installed/removed
 2014-05-27 10:11:27 -06:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00
Erik Johnson
da0546c6f4 add test for npm.installed/removed 2014-05-26 06:19:49 -05:00
Pedro Algarvio
5a8575dbb9 The helper method is now released 2014-05-20 10:53:47 +01:00
Pedro Algarvio
e096df9016 Replace string substitution with string formatting 2014-05-01 13:29:38 +01:00
Erik Johnson
b78e558296 Remove unnecessary except 2014-04-25 18:00:04 -05:00
Erik Johnson
cb81b69abc Fix import 2014-04-25 17:58:41 -05:00
Erik Johnson
bffb9b5d43 Add skipIf and destructiveTest 
These tests must be run as root, and create and destroy a user and
group, so this adds the proper decorators.

Additionally, this wraps the assertions from these tests in a try/except
block that ensures that the temp directory created for this test is
cleaned up.
 2014-04-25 17:17:34 -05:00
Erik Johnson
d9fa7c5203 Use new decorators for issue 12209 tests 2014-04-25 17:17:34 -05:00
Erik Johnson
8574d9a19e Use custom user/group for integration tests for #12209 
Not all platforms have a "nobody" user, this commit changes these tests
to use a "test12209" user/group for these tests.
 2014-04-25 17:17:34 -05:00
Erik Johnson
f73a193c6b Add tests for #12209 2014-04-25 17:17:33 -05:00
Erik Johnson
ad53983a16 Fix refs to with_system_account decorator 
This renames this decorator to with_system_user, to go along with
changes in https://github.com/saltstack/salt-testing/pull/14.
 2014-04-25 14:03:41 -05:00
Mike Place
637c372aae Fix bug with mod_watch in supervisor modules 
* Also adds __virtual__ support to supervisord exec module

* Closes #6692

Remove uneeded module.

Don't run supervisord tests without supervisord

Fix state test.

Pulled in an old pylint breakage.

Conflicts:
	salt/modules/saltutil.py
 2014-04-23 16:14:12 -06:00
Mike Place
9ac6e8e150 Remove test. 
Also pass makedirs correctly.
 2014-04-21 10:30:27 -06:00
Mike Place
f717aa6004 Write test for ownership of file.managed with makedirs=True 2014-04-17 15:36:08 -06:00
Thomas S Hatch
09769d6fa2 lint tests 2014-04-02 11:16:24 -06:00
Pedro Algarvio
6f1337b4c8 Remove extra white-space 2014-03-29 13:20:47 +00:00
Pedro Algarvio
596b38e494 Provide env to templates. 
Map `env` to the same value of `saltenv` in the templating context until
`env` is fully deprecated in favor of `saltenv`.

Fixes #11480.
 2014-03-29 13:03:36 +00:00
Thomas S Hatch
43de620730 Merge pull request #11413 from s0undt3ch/hotfix/immutable-lists-sum 
Simpler immutable types
 2014-03-21 11:40:09 -06:00
C. R. Oldham
6c60f17751 Add two tests for checking file permissions when file is already existing 2014-03-17 14:25:17 -06:00
Erik Johnson
37bf8ee768 Change package used for opensuse integration pkg tests 2014-03-14 11:50:32 -05:00
Colton Myers
ea800935d7 Switch git clones to saltstack/salt-test-repo (super small repo) 
Was previously cloning bootstrap a few times, and our salt repo once
(which is a large repo).  Should speed up the git tests substantially.
 2014-03-14 09:45:17 -06:00
Pedro Algarvio
2f3d7bd6cc Merge branch 'develop' of github.com:saltstack/salt into hotfix/immutable-lists-sum 2014-03-13 16:03:50 +00:00
Mathieu Le Marec - Pasquet
ab0b465d3e Yet another fix for ImmutableProxyList 
This is related to #11088, #11035, #11003, #11190.
 2014-03-13 10:53:55 +01:00
Pedro Algarvio
e1c33dcad6 Revert "Stop running the test while it's failing" 
This reverts commit a084303c91.
 2014-03-12 21:52:08 +00:00
Pedro Algarvio
a084303c91 Stop running the test while it's failing 2014-03-10 23:52:38 +00:00
Pedro Algarvio
fd1bab0d8d Add test case which triggers #11003. 2014-03-10 17:47:22 +00:00
Erik Johnson
98bcd26139 Fix pkg test with dots in filename 
The package here is much smaller and should install quicker than the old
one.
 2014-02-11 11:22:34 -06:00
Thomas S Hatch
8ce74e0378 disable dot test, need to find another package 2014-02-11 09:41:10 -07:00
Pedro Algarvio
3fceb028eb Ignore and remove unused imports 2014-02-08 07:46:50 +00:00
Pedro Algarvio
fd306ea0b0 We need a bigger timeout, salt's repo is pretty big now. 2014-02-08 03:07:30 +00:00
Pedro Algarvio
b66418e263 Provide tests cases for #10197 and #10198 2014-02-05 21:56:08 +00:00
Thomas S Hatch
94a6b01522 Merge pull request #10011 from makinacorpus/fix10010 
display full jinja traceback when applicable
 2014-01-29 07:41:29 -08:00
Mathieu Le Marec - Pasquet
688abda402 display full jinja traceback when applicable 
This fixes #10010
 2014-01-29 02:04:12 +01:00
Mathieu Le Marec - Pasquet
165b5e4af2 Handle better state errors 
This fixes #9983.
 2014-01-28 16:01:34 +01:00
FELD Boris
43889c7d79 Add a test for git states support of numeric revision 2014-01-15 17:20:08 +01:00
Pedro Algarvio
106c44587e Merge pull request #9701 from s0undt3ch/hotfix/ssh-binaries 
Skip the tests if binaries are missing.
 2014-01-11 14:47:14 -08:00
Pedro Algarvio
2bb11d24b9 Skip the tests if binaries are missing. 2014-01-11 14:38:17 -07:00
Pedro Algarvio
c8038d87b1 Use KNOWN_BINARY_NAMES from salt.modules.virtualenv 2014-01-11 12:19:29 -07:00
Thomas S Hatch
b90b4a0db8 Set tests to refresh fs list cace with every check 2014-01-09 15:10:42 -07:00
Pedro Algarvio
2cab3227fd The virtualenv binary can have multiple CLI names. 2014-01-02 20:27:18 +00:00
Mike Place
ca57a864b8 Increase timeout for pkg tests. 
* Since we started running a refresh_db in pkgrepo (7c3d0cc80d), we may be checking an exit code prematurely. This increases the timeouts to 120 seconds to see if Jenkins will calm itself.
 2013-12-30 11:08:32 -07:00
Pedro Algarvio
27a32c5849 Catch the proper exception. White-space fixes. 2013-12-13 08:12:00 +00:00
Thomas S Hatch
781bfe2455 remove reduntant faulty test 2013-12-12 15:18:36 -07:00
Thomas S Hatch
7957455ff9 some pylint fixes for mysql tests 2013-12-12 14:56:45 -07:00
regilero
f1b6b4af55 MySQL tests: add a localhost target on mysqladmin test to check for MySQL server presence 2013-12-12 21:23:52 +01:00
regilero
9195f8e5f7 Lint fix 2013-12-11 14:40:42 +01:00
regilero
3b14cd7cb4 Merge remote-tracking branch 'upstream/develop' into mysql_additions 2013-12-11 00:56:56 +01:00
regilero
82c1cb8e64 MySQL states, grants integration tests 2013-12-11 00:54:05 +01:00
regilero
f980c64bc4 MySQL Module: remove use_unicode connection attribute, not needed for charset managment and would create new bugs with unicode() strings 2013-12-10 23:07:13 +01:00
Pedro Algarvio
2648ed90ba Fix lint issues. 2013-12-09 20:02:25 +00:00
Thomas S Hatch
8408c1a583 Merge pull request #9053 from regilero/utf8-sls 
Proposal for utf-8 support in sls files
 2013-12-09 10:41:15 -08:00
regilero
6c0b53547d MySQl: fix states integration tests 2013-12-08 17:10:37 +01:00
Erik Johnson
e618befaf8 Add test case for numeric GECOS data 2013-12-06 16:16:38 -06:00
regilero
3769474d9d One more test,to be sure 2013-12-05 18:50:31 +01:00
regilero
bd9a0394ae Integration tests for issue #8947 utf-8 in sls 2013-12-05 18:18:20 +01:00
regilero
b376d1a82b MySQL States integration module with db tests 2013-12-04 22:33:33 +01:00
Erik Johnson
093065b130 add test for #8614 2013-11-30 22:00:05 -06:00
Pedro Algarvio
8d3e3d3402 Skip the test if python-apt is not installed for Debian like systems. 2013-11-28 19:26:21 +00:00
Pedro Algarvio
d02a2bc224 Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
Thomas S Hatch
eb9ba6fda0 Merge pull request #8756 from s0undt3ch/issues/8343-require_in-KeyError 
Fix accomulator issues
 2013-11-26 13:18:49 -08:00
Erik Johnson
05de056df0 Add an assert to ensure that the state.sls return dict isn't empty 2013-11-25 17:41:03 -06:00
Erik Johnson
1c9f2fc224 Remove grains requirement 
I had this code here in an early draft of this test, but the grains are
no longer needed here as the stuff that requires grains has been moved
out of the test function and into the SLS files that are run by the
test.
 2013-11-25 17:30:18 -06:00
Erik Johnson
a77357f01d Fix pkgrepo tests when python file is run by itself on CLI 2013-11-25 17:27:26 -06:00
Erik Johnson
c2e346835c Add pkgrepo tests for CentOS 
Ubuntu ones will follow soon.
 2013-11-25 17:20:32 -06:00
Pedro Algarvio
f0bf78cdc0 Correct the state test case and respective expected output. 2013-11-24 12:15:20 +00:00
Pedro Algarvio
a752421b87 Expose a copy of the state dictionary to state functions. 
Fixes #8343 since `__sls__` is now available in `__state__` and not on `kwargs`.
Closes #8709 since it's not the right approach.
Fixes #8710 and closes #8711 since I've cherry-picked the fix for #8710 in from #8711.
 2013-11-24 11:08:33 +00:00
Pedro Algarvio
54fc502de0 Some more saltenv related tests. 2013-11-12 06:29:55 +00:00
Pedro Algarvio
d88d34ca24 The GitHub IP changed. 2013-11-11 07:45:10 +00:00
Pedro Algarvio
77101231f2 Install a smaller and with less dependencies package. 2013-11-07 22:09:36 +00:00
Colton Myers
78662d270b Merge pull request #8325 from cachedout/#7860 
Add a dir_mode to file.managed
 2013-11-07 09:35:54 -08:00
Mike Place
2e6bf21635 Integration testing for file.managed dir_mode argument. 
Added documentation for dir_mode to file.managed.
 2013-11-07 10:19:16 -07:00
Pedro Algarvio
ec0a4bca8e URL environment selection should also be using saltenv. 2013-11-06 23:36:40 +00:00
Pedro Algarvio
962f8d4149 Support adding files to the testing prod state env. 2013-11-06 20:18:47 +00:00
Pedro Algarvio
c170d1e572 Updated test cases to include environment selection in states using __env__. 2013-11-06 20:04:54 +00:00
Henrik Holmboe
77fd1acb7f Change assertEquals to assertEqual 
According to
http://docs.python.org/2/library/unittest.html#deprecated-aliases
assertEquals is a deprecated alias of assertEqual.
 2013-10-24 11:39:04 +02:00
Erik Johnson
95efdad8ba Remove ubuntu 32-bit target 2013-10-20 21:47:05 -05:00
Erik Johnson
7984a8c2cf Apparently the test framework doesn't like private member functions 2013-10-20 21:46:06 -05:00
Erik Johnson
81434578fc Fix function name 2013-10-20 21:29:36 -05:00
Erik Johnson
1c0d279c59 Fix import error 2013-10-20 20:50:28 -05:00
Erik Johnson
9397840021 More tweaks to package tests 
This makes package tests work better on CentOS 5, and also adds a 32-bit
target for Ubuntu.
 2013-10-20 20:27:45 -05:00
Erik Johnson
90d6d045f1 Move _wait_for_pkgdb_unlock inside of PkgTest class 2013-10-20 18:48:01 -05:00
Erik Johnson
63ee0f1e83 Add function to wait for pkgdb lock to clear 
Arch pkg tests that call pkg.latest_version seem to fail on running
this function due to the package database still being locked from
previous tests. This adds a function that waits (in 5 second increments)
for up to 60 seconds for the pkgdb to be unlocked.

http://jenkins.saltstack.com/job/salt-rs-arch/474/artifact/salt-runtests.log/*view*/
 2013-10-20 18:18:35 -05:00
Erik Johnson
c5f5b400e9 adjust redhat pkg targets for pkg tests 2013-10-20 17:04:27 -05:00
Erik Johnson
62a9385ddf Don't perform version spec pkg tests on FreeBSD 
pkg_add does not support this, so this test will fail when
pkg.latest_version is run and an assertion is done to determine the
targeted version.
 2013-10-20 16:00:14 -05:00
Erik Johnson
5dc08d552a adjust pkg targets for pkg tests 2013-10-20 15:48:57 -05:00
Erik Johnson
fe1c4487e3 add tests for installing 32-bit packages 2013-10-20 15:16:36 -05:00
Erik Johnson
c7fcc79747 Add tests for pkg.installed with version specification 2013-10-20 14:35:10 -05:00
Erik Johnson
9d75d7a425 Change packages for pkg.installed tests on Debian-based systems 
Travis-CI uses Debian/Ubuntu VMs and bzr is on their base image, so this
causes these tests to fail on Travis. This replaces bzr for tests on
Debian-based OSes.
 2013-10-19 10:48:10 -05:00
Erik Johnson
0205f28e4a Add pkg.installed tests 2013-10-19 09:50:48 -05:00
C. R. Oldham
66e3be46d1 Make sure multiple names clauses retain same order 2013-10-18 14:57:48 -06:00
Pedro Algarvio
e7ddf159a1 Make sure there's a line break before writing new key. Fixes #7409. 2013-09-28 00:00:26 +01:00
Pedro Algarvio
2f3ed58541 Add test case which verifies the occurrence of #7409. 2013-09-28 00:00:25 +01:00
Pedro Algarvio
bacd2264ee State calls now fail if non-supported arguments are used. Fixes #6962. 
* Removed `format_call` from `salt.state.State` since it was almost a one to one copy of `salt.utils.format_call`.
* The `format_call` in `salt.utils` was modified to accept initial return data(to provide the functionality from the removed `State.format_call`.
* While the function arguments are being queried/matched, those used are removed from a copy of the passed data. Once finished, any remaining keyword arguments which do not match those allowed on the `expected_extra_kws` keyword argument to `format_call` will raise a `SaltInvocationError`.

This will prevent any future bogus bug searching like what happened on #6912 because the wrong state function argument was being passed.
 2013-09-24 22:08:07 +01:00
Seth House
ea657eed48 Added unit and integration tests for the file.replace functions 2013-09-20 17:01:57 -06:00
Pedro Algarvio
e18ba0758b Don't include authorship in generated documentation, the Sphinx way. 2013-09-16 17:24:00 +01:00
Pedro Algarvio
a8e70d527e List pip from the right place. 2013-09-11 10:54:43 +01:00
Thomas S Hatch
80f4aff88c Merge pull request #7143 from s0undt3ch/hotfix/pip-tests 
Adapt and fix the changes from #6833
 2013-09-10 21:08:06 -07:00
David Anderson
b383440302 Fix issue 6800. cwd=target was being passed to _run_check which blew up if target dir did not already exist. 2013-09-10 13:45:30 -06:00
Pedro Algarvio
fc5212dce0 Add a test case for #6833. Refs #7130. 2013-09-10 10:52:17 +01:00