Commit Graph

273 Commits

Author SHA1 Message Date
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
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
rallytime
dc23823897 Merge branch '2014.7' into '2015.2'
Conflicts:
	salt/modules/localemod.py
2015-01-27 13:24:14 -07:00
rallytime
299374a211 Change image name in rackspace profile config to a valid one 2015-01-24 20:14:23 -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
Seth House
e96654744f Added test for git_pillar branch to env mappings 2015-01-06 16:51:58 -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
5a6811759f Fix tests for #18841. 2014-12-18 01:51:26 +01:00
Elias Probst
e82c6ba7c0 Add missing line. 2014-12-18 01:50:39 +01:00
Elias Probst
6363aa22ac Add integration tests for 'modules.file.replace()'. 2014-12-17 12:06:58 +01:00
Colton Myers
716a7e3331 Merge branch '2014.7' into merge-forward
Conflicts:
	salt/modules/bsd_shadow.py
	salt/modules/freebsdjail.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
	salt/modules/zypper.py
	salt/netapi/rest_tornado/saltnado.py
	salt/states/dockerio.py
2014-11-18 12:46:29 -07:00
Thomas Jackson
f0f9b14ee2 Add tests for MinionSaltAPIHandler 2014-11-13 08:36:27 -08:00
Pedro Algarvio
4235d15184 Merge branch '2014.7' into develop 2014-11-07 21:47:49 +00:00
Pedro Algarvio
b425c20919 2 of 500000
Let's not hardcode the SSH tests to the root user without the need for
that.
2014-11-06 19:42:59 +00:00
rallytime
b49c677af8 Merge branch '2014.7' into merge_forward
Conflicts:
	salt/daemons/flo/core.py
	salt/daemons/salting.py
	salt/minion.py
	salt/modules/introspect.py
	salt/modules/lxc.py
	salt/modules/sysmod.py
	salt/runners/doc.py
	salt/states/cloud.py
	salt/transport/__init__.py
	salt/utils/github.py
2014-11-04 10:07:02 -07:00
rallytime
92fc46607f Don't use HVM image type. 2014-11-03 16:12:21 -07:00
rallytime
e272c41bb8 Use Ubuntu 14 image for ec2 cloud tests instead of RHEL 6 2014-11-03 15:13:14 -07: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
d2b548a0e7 Add regression test for #17051 2014-10-30 16:43:06 -07:00
Thomas Jackson
52f7216bea Revert naming here too 2014-10-29 14:35:27 -07:00
Thomas Jackson
aabe6460f6 Misc comment cleanup in tests 2014-10-28 08:12:10 -07:00
rallytime
933be7c476 Merge branch '2014.7' into develop
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
2014-10-25 08:54:42 -06:00
rallytime
f94cf6ad68 Change profile name for Digital Ocean cloud tests
Digital Ocean changed their image-naming scheme. This should fix the failing tests.
2014-10-24 16:14:02 -06:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
2014-10-19 18:21:19 +01:00
Daniel Mizyrycki
54738d0ff5 Added salt-ssh integration test for custom module within SLS 2014-10-17 15:39:49 -07:00
C. R. Oldham
d07ebe2105 Test for retcode 2014-10-14 13:28:19 -06:00
Thomas S Hatch
b2e730a2a6 Merge pull request #16158 from thatch45/pillar_opts_false
Set pillar_opts to default to False
2014-10-13 14:33:44 -06:00
Thomas S Hatch
251a036938 Set the tests to still asume pillar_opts 2014-10-13 08:58:20 -06:00
Seth House
12b1ba289a Added a wildcard eauth user for testing 2014-10-03 13:28:29 -06:00
Seth House
a5d861314b Added a wildcard eauth user for testing 2014-10-02 19:21:51 -06:00
rallytime
ffe00e0909 Update ec2 provider and profile config files for cloud nightly tests 2014-09-18 20:41:08 -06:00
Erik Johnson
111a09f2ad Merge remote-tracking branch 'upstream/2014.7' into develop
Conflicts:
	salt/minion.py
	salt/output/nested.py
2014-09-16 18:46:48 -05:00
rallytime
85f82816c2 Revert "Put provider specific information only in provider configuration file"
This reverts commit 1ccec204b2.
2014-09-16 08:40:43 -06:00
rallytime
1ccec204b2 Put provider specific information only in provider configuration file 2014-09-16 07:08:18 -06:00
rallytime
b30e750a8a Azure cloud tests
Oh, and rename cloud.profiles.d/azure.sls to cloud.profiles.d/azure.conf
2014-09-15 16:58:26 -06:00
rallytime
a30ccd2a7b Add cloud provider and profile configuration files 2014-09-15 15:57:27 -06:00
rallytime
40253cb47b Update ec2 provider and profile config files for cloud nightly tests 2014-09-08 17:06:45 -06:00
rallytime
1727d04701 Generate random cloud provider names on digital ocean 2014-09-05 15:57:00 -06:00
rallytime
6de2a37ec8 Generate random cloud instance name on rackspace tests 2014-09-05 14:09:42 -06:00
rallytime
f5597010ca Add GPG key file to integration tests 2014-07-31 10:57:49 -06:00
Seth House
b077b2436e Add 'auto' eauth backend for tests 2014-07-24 16:08:30 -06:00
C. R. Oldham
9dc3f696ca Fix two RHEL7 tests 2014-07-24 14:11:03 -07:00
Aditya Kulkarni
a7b52855d3 Make sure multiple git pillar sources work 2014-07-08 10:58:31 -06:00
Mike Place
c3d0b5cba5 Dummy file to fix failing tests. 2014-07-01 15:58:01 -06:00
Thomas S Hatch
50ee9dd5af Merge pull request #13680 from pass-by-value/file_perms_no_exit
File perms no exit
2014-06-30 17:43:54 -06:00
Aditya Kulkarni
3a59cbf9cb Add regression test for master_tops 2014-06-25 14:53:11 -04:00
rallytime
c001f717a4 Fix digital ocean provider integration tests 2014-06-24 14:33:15 -06:00
Aditya Kulkarni
8ee2e01092 Change from auto to pam 2014-06-24 14:17:54 -04:00
rallytime
276affe259 Initial cloud provider tests for GoGrid 2014-06-12 17:09:57 -06:00
rallytime
dd03b59dc6 Rackspace with openstack driver cloud tests 2014-06-11 11:26:30 -06:00
rallytime
da839f9ec7 salt-cloud tests for digital ocean 2014-06-09 14:49:49 -06:00
rallytime
7689a9bc99 salt-cloud tests for linode 2014-06-09 14:49:49 -06:00
Pedro Algarvio
7bd8b1360f Remove remaining exsel code 2014-05-29 01:32:54 +01:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00
Mike Place
f3733fabf4 Clean up sshd config.
Remove hostkeys that are now dymaically generated per-run.

No more usepam
2014-05-23 15:04:11 -06:00
Mike Place
7abc25f67f Generate server keys too 2014-05-23 14:11:14 -06:00
Mike Place
cf25592c53 Working salt-ssh test runner
This rounds out initial (alpha) support for a salt-ssh test runner.

At present, one must manually specify the --ssh flag to ensure that
the ssh deamons are spun up properly.

Conflicts:
	tests/integration/__init__.py
	tests/integration/files/conf/_ssh/sshd_config
	tests/integration/files/conf/sshd_config
	tests/integration/files/ext-conf/sshd_config
2014-05-23 14:11:14 -06:00
Elias Probst
f57dce2224 Correct usage of 'CLI Example' in documentation blocks
This mass-edit was done using the following shell command:
ack --python -l '^(\s*)CLI Example::$' \
| xargs sed -i \
's/^\(\s*\)CLI Example::/\1CLI Example:\n\n\1.. code-block:: bash/g'
2014-05-14 19:29:49 +02:00
Pedro Algarvio
6b1380a25c Move sshd_config file to another directory to avoid problems. 2014-05-12 19:06:09 +01:00
Mike Place
d7bba818a9 Only listen on localhost. 2014-05-10 14:18:53 +01:00
Mike Place
0cbac67a3f Support for continuous integration testing of salt-ssh 2014-05-10 14:18:53 +01:00
Pedro Algarvio
33f361e99d Don't use the deprecated keyword argument 2014-04-24 09:06:28 +01:00
Thomas S Hatch
9ed1e172e3 Maybe this will fix the ubuntu tests on jenkins! 2014-04-02 11:02:03 -06:00
Thomas S Hatch
d478a16ef5 These tests should have never worked!! 2014-04-02 10:27:04 -06:00
Pedro Algarvio
1ef4cd11cb Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +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
a6b3bf4167 Lint fix 2014-01-29 02:43:19 +01: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
Thomas S Hatch
b90b4a0db8 Set tests to refresh fs list cace with every check 2014-01-09 15:10:42 -07:00
Mike Place
444cae7236 Integration test fix
* oscodename should not have been removed.
2013-12-27 13:25:05 -07:00
Mike Place
9a8b9ab49d Fix Ubuntu integration tests.
Ubuntu changed the name of the software-properties package, breaking tests. Details here: https://bugs.launchpad.net/ubuntu/+source/ubuntu-meta/+bug/439566
2013-12-27 09:40:07 -07:00
Ollie Walsh
14da357576 Increase master timeout during tests now that it is not incorrectly incrementing 2013-12-17 01:49:08 +00:00
Seth House
7cfaca6ddb Add basic lowdata test for master_call 2013-12-13 16:00:34 -07:00
Thomas S Hatch
476f0b8a25 Apply yaml_utf8 to test config 2013-12-13 15:20:50 -07:00
regilero
2e48812cfa Merge remote-tracking branch 'upstream/develop' into mysql_additions 2013-12-12 22:10:50 +01:00
Mike Place
d59d8ecfd7 Fileserver integration testing.
Finished the roots integration tests for now. Started on GitFS testing.
2013-12-10 17:45:54 -07:00
regilero
3b14cd7cb4 Merge remote-tracking branch 'upstream/develop' into mysql_additions 2013-12-11 00:56:56 +01:00
Erik Johnson
685d1d36de Fix requisite tests
Now that state.func_name is invalid in requisites, remove them from this
test.
2013-12-06 15:16:57 -06:00
regilero
b376d1a82b MySQL States integration module with db tests 2013-12-04 22:33:33 +01:00
Mathieu Le Marec - Pasquet
5f46962e80 pep8 fixes 2013-12-04 00:25:50 +00:00
Pedro Algarvio
13a9effdaf Add unit tests regarding include.d directories loading. 2013-12-03 19:08:30 +00:00
Mathieu Le Marec - Pasquet
e9246d2a77 Remove bootstrap.py's & adapt tests for zcbuildout module 2013-12-03 17:53:58 +00:00
Mathieu Le Marec - Pasquet
228c987b76 feat: buildout support
This fixes #8856.
2013-11-29 18:51:20 +00:00
Joseph Hall
b32e8901d0 Merge pull request #8899 from terminalmage/tests
Simplify jinja syntax for ubuntu pkgrepo test deps
2013-11-28 10:31:21 -08:00
Erik Johnson
13dbb9efab Simplify jinja syntax for ubuntu pkgrepo test deps
See the below discussion for more info:

https://github.com/saltstack/salt/pull/8872#discussion-diff-7981734R64
2013-11-28 12:27:39 -06:00
Pedro Algarvio
660a91d1ea Merge the salt-cloud cli integration tests into salt's test suite. Refs #8886. 2013-11-28 17:55:58 +00:00
Erik Johnson
0ffce3ce6d Fix ubuntu deps for pkgrepo integration tests
This fixes a typo'ed package name, as well as doing logic to determine
the correct package name based on the osrelease.
2013-11-27 20:01:14 -06:00
Thomas S Hatch
33a719c1d4 Merge pull request #8848 from terminalmage/tests
Add pkgrepo.managed test SLS for Ubuntu
2013-11-27 08:10:12 -08:00
Pedro Algarvio
d02a2bc224 Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
Erik Johnson
55b870e43a Add pkgrepo deps for ubuntu
This fixes travis failures due to needed python module not being
installed.
2013-11-26 23:55:26 -06:00
Erik Johnson
f56ad56a5a Add pkgrepo.managed test SLS for Ubuntu
pkgrepo.absent is not behaving properly, will add a test case for
pkgrepo.absent later once I've had a chance to troubleshoot.
2013-11-26 23:22:59 -06:00
Thomas S Hatch
079c849adf Merge pull request #8834 from cro/dockerio_cleanup
Add some tests for docker integration.
2013-11-26 11:18:22 -08:00
C. R. Oldham
10ef0de5f6 Add some tests for docker integration. 2013-11-26 12:13:25 -07:00
Thomas S Hatch
5637339b2c Merge pull request #8823 from regilero/requisites-fix
Fix #8773: allow syntax error state.foo in requisites with a warning.
2013-11-26 08:07:40 -08:00
Thomas S Hatch
25dcbefb9c Merge pull request #8820 from terminalmage/tests
Add pkgrepo tests for CentOS
2013-11-26 08:05:34 -08:00
regilero
4497751420 Fix #8773: allow syntax error state.foo in requisites with a warning. 2013-11-26 11:57:09 +01:00
regilero
ab88a276dc remove test for issue #8976 closed as expected behavior 2013-11-26 10:51:47 +01:00