Commit Graph

68 Commits

Author SHA1 Message Date
twangboy
3ef4734d0e Increase timeout for Windows 2017-05-02 11:37:01 -06:00
Erik Johnson
7cef07b0d9 Remove legacy git_pillar tests
Also remove git_pillar configuration from the test suite's master
configuration file.
2017-04-20 03:51:08 -05:00
Anthony Shaw
eb8ab0d75a
add tests to show broken functionlity reported in bug report 2017-04-01 09:21:25 +11:00
Pedro Algarvio
31df825a1c
Set the ssh_log_file relative 2017-03-02 19:56:06 +00:00
Erik Johnson
7b958fb389 Add options to skip fileserver/git_pillar preflight checks
This commit also modifies the master config for the test suite to use
this new option, so that a missing GitPython/Pygit2 will not crash the
test suite's master. This should make the test suite run smoother by
only negatively impacting those tests which require the pillar data
provided by git_pillar, when a valid provider is not available.
2017-02-27 20:21:53 -06:00
Erik Johnson
4e577e697d Switch to non-legacy git_pillar syntax in test suite 2017-02-12 15:12:49 -06:00
Mike Place
6e1dcb94ec Account for differences in output 2016-08-22 20:54:03 +09:00
Mike Place
e7405258d4 Merge pull request #35499 from cro/returner_self_destruct
Returner self destruct
2016-08-20 11:42:03 +09:00
rallytime
49179ac401 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/win_pkg.py
  - tests/integration/files/conf/master
2016-08-16 12:52:20 -06:00
C. R. Oldham
9ff22fd4f1 WIP MySQL returner archiver 2016-08-16 10:33:26 -06:00
Mike Place
fc0d5878bc Set file_recv on test master 2016-08-12 19:08:27 +09:00
Mike Place
5f5d7193b0 Add interface to all configs
This got removed during the attempt to make the tests run on Windows.

I added them everywhere even though that's not strictly necessary.

Without these set on the master and sub_master, Windows will throw
erorrs because the networking stack will decide that anything that's
bound to 0.0.0.0 represents an extestential threat to any socket that
attempts to *connect* to one of those ports. (For...reasons.)
2016-07-20 10:00:31 -06:00
twangboy
4e56d28993 Add tcp_master settings to both masters 2016-07-20 10:00:31 -06:00
twangboy
3833c008b2 Cleans up config parameters 2016-07-20 10:00:30 -06:00
twangboy
c1ae2537f1 Remove configuration from configs 2016-07-20 10:00:30 -06:00
twangboy
54647eb7d8 Fix mem leak caused by pki_dir 2016-07-20 10:00:30 -06:00
twangboy
7f3f15378e Make additional changes to master configs 2016-07-20 10:00:30 -06:00
twangboy
a33c5c15da Fix master and sub_minion configs 2016-07-20 10:00:30 -06:00
twangboy
f55ba87bee Fix configs, remove default values 2016-07-20 10:00:30 -06:00
twangboy
9b14dc0a6e Add Pedro's suggestions 2016-07-20 10:00:30 -06:00
twangboy
1805630fdc Fix integration tests on windows 2016-07-20 10:00:29 -06:00
twangboy
f7fb4985c4 Add Pedro's suggestions 2016-07-20 10:00:29 -06:00
twangboy
5bcb27e477 Fix integration tests on windows 2016-07-20 10:00:29 -06:00
Pedro Algarvio
3adf8e286e
Some more test suite run fixes
* Allow more time for the daemons to react to the signals sent
* Fix configuration
* More logging
2016-05-23 13:57:21 +01:00
Pedro Algarvio
7a8460856c
Define IDs and ports on sample configs 2016-05-23 13:56:01 +01:00
LoveIsGrief
1545c9de7f Setup testing for calls to salt-cloud
Related to saltstack/salt#27089 Saltcloud virtualbox provider
2016-02-10 21:38:11 +01:00
Thayne Harbaugh
6f4cfd01fc Specify compound matches as lists
Compound matches, such as nodegroups, can now be specified as lists.  This
avoids splitting on whitespace which may be part of a key or value.

Right now this only works for nodegroups.  Making the argument to "-C"
(compound list) a JSON argument is a future task.
2015-04-24 17:00:04 -06:00
Thayne Harbaugh
b37b6b2849 Add a test for incorrectly-nested nodegroups that cause a resolution loop. 2015-04-17 17:01:47 -06:00
Thayne Harbaugh
6c1d4d58e9 Fix failure with nested nodegroups:
If a nodegroup was re-used - even if it wasn't a circular reference - it
would fail the nodegroup expansion with the following message:

    Failed nodegroup expansion: illegal nested nodegroup "min"

This was simply because already-visited nodegroups are pushed into `skip`
but were never popped.

   * Add another test case for this situation.
   * Pop the current nodegroup from `skip` when leaving the expansion
     context

Fixes: #22797
2015-04-17 15:20:34 -06:00
Thayne Harbaugh
1c3536fb8e Support nested nodegroups
Nodegroups can be recursively expanded without worrying about other
compound matcher expansions.  Once the nodegroups are expanded on the
master the remaining flattened compound match can be expanded without the
nodegroup information.
2015-04-08 23:16:39 -06:00
Colton Myers
2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/topology/syndic.rst
    salt/client/__init__.py
    salt/daemons/masterapi.py
    salt/minion.py
    salt/modules/dockerio.py
2015-03-19 16:03:29 -06:00
Justin Findlay
f735f0b96d add eauth pam group tests
Adds test for #17380.
2015-03-17 14:25:57 -06: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
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
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
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
Aditya Kulkarni
8ee2e01092 Change from auto to pam 2014-06-24 14:17:54 -04: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
David Anderson
ec4475cf30 Fix issue 5951 - correct __opts__['file_roots'] in ext_pillars 2013-10-11 11:53:00 -06:00