Commit Graph

3142 Commits

Author SHA1 Message Date
Nicole Thomas
ff1646e451 Merge pull request #16769 from rallytime/jid_str_test
Test long jid passed on CLI
2014-10-21 15:50:29 -06:00
Cimarron Mittelsteadt
43fea4f3ea TST: Updated mac_user tests for modifications to OS release handling 2014-10-21 15:00:58 -06:00
Bahadır Kandemir
713e168fc2 Add option to mock test. 2014-10-21 18:08:21 +03:00
rallytime
ed37dde094 Pylint fix 2014-10-20 21:21:01 -06:00
rallytime
3020b2084b Test long jid passed on CLI 2014-10-20 16:53:56 -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
e421aff68d Fix lint 2014-10-17 15:39:49 -07:00
Daniel Mizyrycki
54738d0ff5 Added salt-ssh integration test for custom module within SLS 2014-10-17 15:39:49 -07:00
Cimarron Mittelsteadt
d6abb6c77d TST: Updated mac_user tests for modifications to OS release handling 2014-10-17 09:28:56 -07:00
Seth House
c6cb642f36 Added integration tests for the --out-indent flag for JSON output 2014-10-16 20:46:34 -05:00
Thomas S Hatch
1f5da204a9 Fix lint 2014-10-15 16:56:41 -06:00
rallytime
96a1288808 Add minions_denied to netapi test 2014-10-14 16:49:07 -06:00
C. R. Oldham
d07ebe2105 Test for retcode 2014-10-14 13:28:19 -06:00
Thomas S Hatch
5ab6743b85 Merge branch '2014.7' into develop 2014-10-13 20:06:17 -06:00
Thomas S Hatch
4b630d77ed Merge pull request #16407 from s0undt3ch/hotfix/cache-loaded-configs
First attempt at caching the loaded configuration from the filesystem.
2014-10-13 20:05:52 -06:00
Mathieu Le Marec - Pasquet
2d1200b64e pep8 2014-10-13 15:32:11 -06:00
Mathieu Le Marec - Pasquet
acd15e386e display traceback in test error 2014-10-13 15:32:11 -06:00
Mathieu Le Marec - Pasquet
1c4616556a Another fix for outputter reliability 2014-10-13 15:32:10 -06:00
Thomas S Hatch
1468c26ec1 Merge branch '2014.7' into develop
Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
2014-10-13 15:03:33 -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
ef83ad23c3 Merge pull request #16579 from s0undt3ch/hotfix/vt-fixes
More VT fixes
2014-10-13 14:23:11 -06:00
Pedro Algarvio
e683619f9f Having data left to read does not mean the process is alive 2014-10-13 17:19:42 +01:00
Thomas S Hatch
251a036938 Set the tests to still asume pillar_opts 2014-10-13 08:58:20 -06:00
Mathieu Le Marec - Pasquet
7fe9a5e612 pep8 2014-10-12 12:16:07 +02:00
Mathieu Le Marec - Pasquet
a0aa6eee89 display traceback in test error 2014-10-12 11:37:28 +02:00
Pedro Algarvio
4470c0dc68 White-space lint fix 2014-10-12 04:29:59 +01:00
Pedro Algarvio
51479e4592 Include a test case in order to check for full output from VT 2014-10-12 03:37:08 +01:00
Pedro Algarvio
743c26e562 Instead of checking for a live process, check for unread data.
Add a unit test which tests proper behaviour.

Fixes #15941
2014-10-12 02:28:35 +01:00
Pedro Algarvio
41870ef3e0 Fix ensure in syspath call 2014-10-12 02:16:23 +01:00
Pedro Algarvio
4fca1c96da Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00
Pedro Algarvio
52d0d01d09 Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00
Pedro Algarvio
e9fbd9910d Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00
Pedro Algarvio
8d9570ef43 Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00
Mathieu Le Marec - Pasquet
43fce63b5c Another fix for outputter reliability 2014-10-11 18:37:35 +02:00
rallytime
7e09896c7c Clean up boto_secgroup unit test
This test required some tweaks as there are new versions of boto and moto
2014-10-10 16:35:08 -06:00
rallytime
e15bf67fba Clean up boto_secgroup unit test
This test required some tweaks as there are new versions of boto and moto
2014-10-10 16:03:21 -06:00
rallytime
2c513cf2bb Remove print from tests 2014-10-09 10:33:34 -06:00
Seth House
b0615f9bbf Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-08 14:40:32 -06:00
Gareth J. Greenaway
9ae138e1a4 Fixing the unit tests for ps module 2014-10-07 20:56:02 -07:00
Pedro Algarvio
8e93faa072 Fix lint errors 2014-10-08 01:02:11 +01:00
Pedro Algarvio
ff97810661 Load configs from scratch 2014-10-08 01:02:10 +01:00
Pedro Algarvio
ab6a54dbf5 The runtime client gets an unfreeze version of the configs 2014-10-08 01:02:10 +01:00
Pedro Algarvio
5e4eb4bbaf Don't add tests in __init__ 2014-10-08 01:02:10 +01:00
Pedro Algarvio
e739561728 Use the salttesting skip helpers 2014-10-08 01:02:10 +01:00
Pedro Algarvio
d569f0811e Let's go wild and cache the local client as reusable a runtime global instance 2014-10-08 01:02:10 +01:00
Pedro Algarvio
7cab740adf Removed --runner because it's integrated in the client tests 2014-10-08 01:02:10 +01:00
Pedro Algarvio
3de914e556 Move tests away from __init__ 2014-10-08 01:02:08 +01:00
Pedro Algarvio
dee2c91fde Test the runner client under tests/integration/clients 2014-10-08 01:00:20 +01:00
Pedro Algarvio
d0ca8274ae Remove the unnecessary integration.ClientCase class 2014-10-08 01:00:19 +01:00
Pedro Algarvio
b32d86d0f4 Allow getting the configuration from scratch.
Properly handle `client_config` when loading from cache.
Only delete the `_client` attribute if it has been set.
2014-10-08 01:00:06 +01:00
Pedro Algarvio
93e8b12b93 Try caching the client too 2014-10-08 00:57:22 +01:00
Pedro Algarvio
bbc9120471 The syndic_config call needs the path to the minion config file 2014-10-08 00:57:22 +01:00
Pedro Algarvio
4d047a67f5 Handle more config filenames 2014-10-08 00:57:22 +01:00
Pedro Algarvio
3a3c6b06dd First attempt at caching the loaded configuration from the filesystem.
This basically should avoid loading and parsing YAML over and over again.
2014-10-08 00:57:22 +01:00
Seth House
dd400f2e96 Added integration tests WheelClient cmd_sync cmd_async 2014-10-07 16:43:15 -06:00
rallytime
6212cfba12 Fix assertion messages to match and pass tests 2014-10-07 09:36:04 -06:00
rallytime
d8e7feafce Clean up last expectedFailure 2014-10-07 08:42:31 -06:00
rallytime
5ff51987b9 Pylint fix 2014-10-07 08:31:42 -06:00
rallytime
868a6e5459 Change expectedFailures to @skipIfs 2014-10-07 08:13:09 -06:00
rallytime
116c29b135 Fix unittest.case import 2014-10-06 21:24:46 -06:00
rallytime
6a1da81a99 Pylint fix 2014-10-06 20:48:00 -06:00
rallytime
274c61b694 Add docstrings to boto_vpc unit tests 2014-10-06 16:52:57 -06:00
Thomas S Hatch
74bc3b8796 Merge pull request #16095 from thedrow/feature/vpc
[WIP] AWS VPC module improvements
2014-10-06 10:12:07 -06:00
Seth House
9bd61a1bd6 Added integration tests for wildcard eauth usernames 2014-10-03 13:28:29 -06:00
Seth House
12b1ba289a Added a wildcard eauth user for testing 2014-10-03 13:28:29 -06:00
Colton Myers
8dca840248 Remove unused imports 2014-10-03 13:25:04 -06:00
Seth House
d0366eaf50 Added unit test for running arguments through the RunnerClient 2014-10-03 13:25:04 -06:00
Seth House
0d07099444 Added integration tests for wildcard eauth usernames 2014-10-02 23:53:37 -06:00
Seth House
a5d861314b Added a wildcard eauth user for testing 2014-10-02 19:21:51 -06:00
Colton Myers
0ffec8f6d3 Merge pull request #16327 from basepi/bp-16322
Backport #16322 to 2014.7
2014-10-02 15:33:45 -06:00
Colton Myers
0edf446903 Remove unused imports 2014-10-02 13:52:24 -06:00
Seth House
dbe2fe5c92 Added unit test for running arguments through the RunnerClient 2014-10-02 12:00:01 -06:00
Tarjei Husøy (via Travis CI)
25ea6060b7 Replace random.randint() with os.urandom() 2014-10-02 10:20:20 -06:00
Tarjei Husøy (via Travis CI)
ea06fb21cb Replace random.randint() with os.urandom() 2014-10-02 15:21:26 +02:00
Omer Katz
f5c92d70ff Fixed possible test module import failure when boto is not installed. 2014-10-02 15:01:49 +03:00
Omer Katz
5620eddb2d Removed unused import. 2014-10-02 14:32:51 +03:00
Omer Katz
430fea55e2 Added missing check for arguments in route_table_exists(). 2014-10-02 14:26:40 +03:00
Omer Katz
f7bb4b3b67 Added missing check for arguments in network_acl_exists and fixed DHCP options test. 2014-10-02 14:26:39 +03:00
Omer Katz
02654ce0d4 Added missing check for arguments in dhcp_options_exists. 2014-10-02 14:26:39 +03:00
Omer Katz
b0f11e2e70 Added missing check for arguments in subnet_exists. 2014-10-02 14:26:39 +03:00
Omer Katz
2514d3824b Addressing review from @ryan-lane. exists will now raise a SaltInvocationError when arguments are not specified. 2014-10-02 14:26:39 +03:00
Omer Katz
1233e9e2e6 Added the ability to check for existence of subnets by name or tags. 2014-10-02 14:26:39 +03:00
Omer Katz
ab950936e1 Verified that when providing no filters the vpc_exists method returns false. 2014-10-02 14:26:39 +03:00
Omer Katz
3c03cefb3a Added support for filtering vpcs by name or tags. 2014-10-02 14:26:39 +03:00
Omer Katz
1bfff3a573 Rename test names. 2014-10-02 14:26:39 +03:00
Omer Katz
f07d1bf9f2 Fixed some lint errors. 2014-10-02 14:26:39 +03:00
Omer Katz
1fc37e22b6 DHCP tests will now be skipped correctly. 2014-10-02 14:26:39 +03:00
Omer Katz
b3f3b96ff7 Fixed test name. 2014-10-02 14:26:39 +03:00
Omer Katz
e0200ccd56 Skip DHCP tests for now. 2014-10-02 14:26:39 +03:00
Omer Katz
dbadd0b474 Added the ability to replace routes. Fixed failing tests. 2014-10-02 14:26:38 +03:00
Omer Katz
98e669e2f1 Added the ability to delete routes. 2014-10-02 14:26:38 +03:00
Omer Katz
ff48e4aebf Added the ability to create routes. 2014-10-02 14:26:38 +03:00
Omer Katz
4110fb06eb Added the ability to associate route tables. 2014-10-02 14:26:38 +03:00
Omer Katz
40230406fb Added the ability to disassociate a route table. 2014-10-02 14:26:38 +03:00
Omer Katz
dc377b9ece Added the ability to disassociate network acl. 2014-10-02 14:26:38 +03:00
Omer Katz
4e5d07e926 Added the ability to check for existence of route tables. 2014-10-02 14:26:38 +03:00
Omer Katz
312fa78c31 Fixed route table tests. 2014-10-02 14:26:38 +03:00
Omer Katz
f3538b40d2 Added the ability to delete route tables. 2014-10-02 14:26:38 +03:00
Omer Katz
a8e9fcaa3e Added the ability to create route tables. 2014-10-02 14:26:38 +03:00
Omer Katz
5abbc62ccf Added the ability to associate a network acl to a subnet and to create it and associate it in one operation. 2014-10-02 14:26:38 +03:00