Commit Graph

34 Commits

Author SHA1 Message Date
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
Thomas S Hatch
f71a4ee2c8 Add more checks to config 2013-05-26 03:42:41 -06:00
Thomas S Hatch
e6c369c5ec Add opts to master file to test config module 2013-05-26 00:31:43 -06:00
Pedro Algarvio
397418dad7 We're no longer leaking threads. Travis-CI should be OK with 10 worker threads. 2013-04-28 08:16:54 +01:00
Thomas S Hatch
cebdf76f2e Fix publish tests 2013-04-27 12:59:34 -06:00
Thomas S Hatch
47e08fc4fa Remove failing test, I am not sure how it ever passed... 2013-02-06 12:48:33 -07:00
Erik Johnson
77eeb47bea Add tests for nested grain/pillar matching
Also added tests for traditional grain matching when target grain is a
list.
2013-01-26 00:13:51 -06:00
Henrik Holmboe
acc49904cd Remove references to pub_refresh.
The configuration option was removed in 0.10.5.
2012-11-29 16:44:49 +01:00
Ryan Schneider
ad1a43012a Add gzip and template to cp.get_dir, expose make_dirs on cp.get_file 2012-11-14 16:48:26 -08:00
Pedro Algarvio
7c666d21d0 Need at least two worker threads for integration.modules.publish to pass. 2012-11-13 19:10:17 +00:00
David Boucha
4a2ceb458e set worker threads to 1 for testing
Travis CI is failing on python 2.6
Trying to lower total memory consumption so the tests
will pass
2012-11-12 16:22:05 -07:00
Ryan Schneider
c638617612 Add gzip_compression support to cp.get_file 2012-11-08 16:09:38 -08:00
Thomas S Hatch
9f05f53fd7 Fix tests from failing if token present for the user 2012-10-22 14:43:47 -06:00
Pedro Algarvio
ac1fe9810a Point hosts.file and aliases.file to the new tests temporary dir. 2012-10-05 07:10:53 +01:00
Pedro Algarvio
accb15d6ee Add tests for saltstack/salt#1900
* Test both master and minion events firing
 * Allow targeting the minions in `tests.integration.ModuleCase.run_function()`
 * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 07:29:06 +01:00
Pedro Algarvio
5da4fcb109 Fix integration.runners.manage tests.
These tests started to fail after 54cf9ca and specially 5626332.
2012-08-25 14:21:08 +01:00
Pedro Algarvio
759d67ffc0 Reverted back the --key-logfile deprecation.
On the parsers cleanup branch, I though about making the available options as equal as possible. Since the log_file setting for the master and the minion could be separately set,  I made the logfile option for the key also log_file. Yet, since there's no key specific config file, it shares master, one could only specify the log_file settings from the cli,   it could not be hardcoded on the config file, unless, we made a separate config file just for key.
So, in order to reduce required changes, and keep it all as backwards compatible as possible, the key log file options is now, once again, `--key-logfile` which will allow us to   hardcode it in the masters config file as `key_logfile`.
This will also, hopefully make travis behave better too.
2012-08-08 01:08:38 +01:00
Pedro Algarvio
2a7e9500d7 Set the master's logfile to avoid travis failing. 2012-08-06 17:58:30 +01:00
Thomas S Hatch
e446a306c7 Add sock_dir verification to tests 2012-07-07 22:11:36 -06:00
Thomas S Hatch
5b05d77405 Add sock_dir setting for the integration test syndic 2012-06-05 17:51:52 -06:00
Thomas S Hatch
dd6e2da941 Fix salt-key test for new minion 2012-05-23 08:05:47 -06:00
Thomas S Hatch
c9cddd2245 Add second minion to tests 2012-05-23 08:04:38 -06:00
Thomas S Hatch
76efdd9fb0 Fix bug in tests with aliases 2012-05-16 22:49:19 -06:00
Thomas S Hatch
c5df9f6526 Add config for aliases tests 2012-05-13 23:51:00 -06:00
Thomas S Hatch
cda5dfbf4d update configs for syndic tests 2012-03-29 01:03:11 -06:00
Thomas S Hatch
fac809f11a add initial files for syndic tests 2012-03-29 01:02:40 -06:00
Thomas S Hatch
1e63ffc862 Add syndic master config for the test environment 2012-03-28 22:13:34 -06:00
Thomas S Hatch
7221d566e5 Add auth test for minion publish 2012-03-28 18:47:10 -06:00
Thomas S Hatch
ecfb4b1df0 update config for publish tests 2012-03-28 18:36:38 -06:00
Dan Colish
6f5b6a63f7 Fix integration tests on osx 2012-03-08 23:47:34 -08:00
Eivind Uggedal
ab7ace6aa5 Split out integration tests from pure unit tests.
Integration tests requiring a salt master and daemon were seperated
from pure unit tests. For now both are run with runtest.py. In
the future it could take arguments for which type of tests to run.
2012-02-20 13:18:13 +01:00