valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
32,723 Commits 24 Branches 182 Tags 341 MiB
7590586d05
Commit Graph

1218 Commits

Author SHA1 Message Date
Pedro Algarvio
7590586d05 Don't fail on missing CherryPy 2014-06-19 13:00:38 +01:00
Seth House
53bab586f4 Merged salt-api into Salt 
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
 2014-06-18 22:13:56 -06:00
Seth House
d526c9ec2b Mock fire_event() in test to check auth setting 2014-06-18 16:52:14 -06:00
Mike Place
c4f5298d62 Create gitfs cache dir if does not exist 
Should fix test suite
 2014-06-17 12:04:53 -06:00
Mike Place
b278fcebff Use sha1 hash for gitfs tests 2014-06-16 16:16:57 -06:00
Pedro Algarvio
9e1634d386 Patch the gitfs opts with custom opts and not master opts. 
It worked but this was, as it was, it's more explicit
 2014-06-15 13:25:21 +01:00
Pedro Algarvio
0a10c4d2c7 Turns out all we needed was the correct load 2014-06-15 13:24:39 +01:00
Pedro Algarvio
79d7918271 Add missing path key to the load. 
Minor PEP-8, global variable `load` -> `LOAD`
 2014-06-15 13:18:36 +01:00
Pedro Algarvio
edffec0159 Fix imports 2014-06-15 13:05:19 +01:00
Pedro Algarvio
7b017fe9ab Skip test for now. 
/CC: @cachedout
 2014-06-15 13:05:19 +01:00
Pedro Algarvio
130788864f Skip tests on missing empty_dir 2014-06-15 13:05:19 +01:00
Pedro Algarvio
b2f3cecea5 Copy the extension modules into the new master root_dir 2014-06-15 13:05:19 +01:00
Pedro Algarvio
bd35008d34 No need for late imports. Use AdaptedConfigurationTestCaseMixIn. 2014-06-15 13:05:19 +01:00
Pedro Algarvio
ccdd70750c Leave any cleanup for the end 2014-06-15 13:05:18 +01:00
Pedro Algarvio
70f6a90ed6 Store evaluated configs as cls attributes 2014-06-15 13:05:17 +01:00
Pedro Algarvio
007f86b5d6 Remove stray print and commented out entries 2014-06-15 13:05:17 +01:00
Pedro Algarvio
d9ce87c04c Call verify_env on transplant_configs 2014-06-15 13:05:17 +01:00
Pedro Algarvio
7fbc839942 Lay down computed configuration and use that source for all of the tests 2014-06-15 13:05:17 +01:00
Pedro Algarvio
97f150db74 Revert "detect the right transport for the client in tests" 
This reverts commit d33b01d635.
 2014-06-15 13:05:17 +01:00
Pedro Algarvio
9fbc894f51 Revert "Cache the salt client" 
This reverts commit b4786b0d8c.
 2014-06-14 19:19:44 +01:00
Pedro Algarvio
b4786b0d8c Cache the salt client 2014-06-13 23:47:03 +01:00
Pedro Algarvio
da7e7d71dd Merge pull request #13434 from rallytime/cloud_tests 
Initial cloud provider tests for GoGrid
 2014-06-13 01:08:30 +01:00
rallytime
276affe259 Initial cloud provider tests for GoGrid 2014-06-12 17:09:57 -06:00
Thomas S Hatch
d33b01d635 detect the right transport for the client in tests 2014-06-12 16:53:50 -06:00
Thomas S Hatch
46cdb04ada Merge pull request #13422 from cachedout/publish_tests 
Fix publish tests
 2014-06-12 14:14:23 -06:00
Mike Place
616c3b5547 Fix failing test 2014-06-12 13:35:36 -06:00
Thomas S Hatch
525cd2a064 Use new client function 2014-06-12 12:41:00 -06:00
Thomas S Hatch
af1a21691a Skip cleaning up syndic stuff so we don't have issues with raet tests 
before the syndic stuff is all ready for testing
 2014-06-12 12:35:24 -06:00
Thomas S Hatch
0b02be9af1 Initial code to do raet integration salt tests 2014-06-11 15:35:27 -06:00
Pedro Algarvio
f316a8242f Merge pull request #13392 from rallytime/rackspace_cloud_tests 
Rackspace with openstack driver cloud tests
 2014-06-11 19:31:05 +01:00
rallytime
87bf98a0db Code clean-up and remove shadowing 2014-06-11 11:42:00 -06:00
rallytime
28b8900b9b Added expensiveTest decorator 2014-06-11 11:35:34 -06:00
rallytime
dd03b59dc6 Rackspace with openstack driver cloud tests 2014-06-11 11:26:30 -06:00
Pedro Algarvio
5f2cc54160 Assert proper return types from state calls. 
Just to be sure.
 2014-06-11 01:12:13 +01:00
Pedro Algarvio
8b03cd8d2e Decorate tests as expensive 
Less trouble for the new runtests script
 2014-06-10 19:25:04 +01:00
Pedro Algarvio
8ae3268037 Merge pull request #13339 from rallytime/cloud_tests 
Cloud tests
 2014-06-10 19:16:42 +01:00
rallytime
51896c4622 remove expensive test decorator and add run_test 2014-06-10 10:20:46 -06:00
Pedro Algarvio
5283fa661e Adapt tests to behaviour introduced in #13333 2014-06-10 03:00:19 +01:00
Pedro Algarvio
0b6776ad81 Maintain old test behaviour(no new lines added) 2014-06-10 02:32:22 +01:00
Pedro Algarvio
df3e06ddd7 Test needs root perms 2014-06-10 01:56:24 +01:00
rallytime
36b2a3a0e7 Added cloud provider tests decorator 2014-06-09 14:49:49 -06:00
rallytime
da839f9ec7 salt-cloud tests for digital ocean 2014-06-09 14:49:49 -06:00
rallytime
ea879c0aa5 Error messaging 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
01a48b6b5b Fix PEP8 E714 - test for object identity should be "is not" 2014-06-06 11:37:16 +01:00
Pedro Algarvio
e03226c67b Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:27:26 +01:00
Pedro Algarvio
d1a8e772da Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:27:01 +01:00
Pedro Algarvio
c6aa49c325 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:26:40 +01:00
Pedro Algarvio
cf4a531e62 Fix ensure in syspath 2014-06-05 15:56:20 +01:00
Pedro Algarvio
81b93dc944 Skip tests which need the empty_dir. 
These will run perfectly fine with the upcoming salt-runtests.
 2014-06-05 11:54:07 +01:00