14 Commits

Author	SHA1	Message	Date
Colton Myers	b509cdfa4b	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/conf.py salt/cloud/clouds/gce.py salt/cloud/clouds/linode.py salt/grains/ssds.py salt/modules/git.py salt/modules/pip.py tests/integration/cloud/providers/gogrid.py tests/integration/cloud/providers/linode.py tests/integration/cloud/providers/msazure.py tests/integration/cloud/providers/rackspace.py tests/unit/modules/pip_test.py	2015-08-28 16:33:54 -06:00
rallytime	9ae1539c62	Update cloud tests to be more efficient and accurate	2015-08-25 09:49:32 -06:00
rallytime	c56d3150ec	Fix linode cloud tests	2015-06-19 10:55:12 -06:00
Pedro Algarvio	dc2d3b8ba2	The imports do work!	2015-01-30 22:25:29 +00:00
Pedro Algarvio	207f3ddbf1	Py3 compatibility fixes	2015-01-30 22:25:08 +00:00
Pedro Algarvio	60f215f191	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
rallytime	df504928b6	Update linode tests to use a randomly generated instance name	2014-09-05 09:23:40 -06:00
Pedro Algarvio	992cdc07b1	Reorder imports and don't even run setUp is expensive tests are not enabled	2014-06-23 00:58:39 +01:00
rallytime	87bf98a0db	Code clean-up and remove shadowing	2014-06-11 11:42:00 -06:00
Pedro Algarvio	8b03cd8d2e	Decorate tests as expensive ... Less trouble for the new runtests script	2014-06-10 19:25:04 +01:00
rallytime	51896c4622	remove expensive test decorator and add run_test	2014-06-10 10:20:46 -06:00
rallytime	36b2a3a0e7	Added cloud provider tests decorator	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