Commit Graph

80 Commits

Author SHA1 Message Date
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
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
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
Seth House
b077b2436e Add 'auto' eauth backend for tests 2014-07-24 16:08:30 -06:00
Aditya Kulkarni
a7b52855d3 Make sure multiple git pillar sources work 2014-07-08 10:58:31 -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
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
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
Thomas S Hatch
b90b4a0db8 Set tests to refresh fs list cace with every check 2014-01-09 15:10:42 -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
Pedro Algarvio
13a9effdaf Add unit tests regarding include.d directories loading. 2013-12-03 19:08:30 +00: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
David Anderson
ec4475cf30 Fix issue 5951 - correct __opts__['file_roots'] in ext_pillars 2013-10-11 11:53:00 -06:00
Thomas S Hatch
de53840457 Reduce test suite worker threads to 3, the peer system does not
need extra procs anymore
2013-08-12 22:33:59 -06:00
Pedro Algarvio
e467b1e00b Simplify the Syndic configuration testing.
* Inherit the master configuration file on the syndic one.
* Recreate the Syndic on the test. Don't pass it as a module global.
2013-07-17 16:22:18 +01:00
Mathieu Le Marec - Pasquet
cff1fa6f53 fix/feat: let the syndic be way more configurable
- Fix micmac between configs
- Add options to configure pidfile, logfile, masterofmaster port

This fixes #6024.
2013-07-15 20:30:26 +00:00
Thomas S Hatch
2b917aef23 Add loop_interval to minion config for tests 2013-05-28 14:27:01 -06:00
Thomas S Hatch
d48702aaa5 Add mine_functions to grains 2013-05-26 06:59:13 -06:00