Commit Graph

4 Commits

Author SHA1 Message Date
SrikanteswaraRao Talluri 798a6aa2e3 Marvin + test changes from master Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 404ac549bf)

Conflicts:
	test/integration/smoke/test_vm_iam.py
	tools/marvin/marvin/deployDataCenter.py
	tools/marvin/marvin/lib/base.py
2014-07-28 17:40:56 +02:00
SrikanteswaraRao Talluri 5f5416a51c CLOUDSTACK-6125: adding 'selfservice','provisioning' tags to segregate the tests
that can be run on simulator only and that needs hardware.

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-03-28 15:38:31 +05:30
Gaurav Aradhye 5882123f19 CLOUDSTACK-5640: Correcting imports in test cases
Conflicts:
	test/integration/component/test_security_groups.py
2013-12-30 14:40:58 +05:30
Ashutosh K cb918928e6 Missing tests from QA repo to ASF - 3 tests from test_vmware_drs.py 2013-11-13 21:51:35 +05:30