You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2014/12/17 12:59:12 UTC
[4/4] git commit: updated refs/heads/4.5 to ed5bc1c
CLOUDSTACK-8071: Fixed api key issue in test_snapshots_improvement.py
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ed5bc1c7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ed5bc1c7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ed5bc1c7
Branch: refs/heads/4.5
Commit: ed5bc1c7ea1885e95c7cad0045243c7f43e9f516
Parents: 9481460
Author: Ashutosh K <as...@clogeny.com>
Authored: Mon Dec 15 15:54:51 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Wed Dec 17 17:28:53 2014 +0530
----------------------------------------------------------------------
.../component/test_snapshots_improvement.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed5bc1c7/test/integration/component/test_snapshots_improvement.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshots_improvement.py b/test/integration/component/test_snapshots_improvement.py
index 6638ddd..1fd4239 100644
--- a/test/integration/component/test_snapshots_improvement.py
+++ b/test/integration/component/test_snapshots_improvement.py
@@ -303,7 +303,9 @@ class TestCreateSnapshot(cloudstackTestCase):
def setUpClass(cls):
cls.testClient = super(TestCreateSnapshot, cls).getClsTestClient()
cls.api_client = cls.testClient.getApiClient()
-
+ cls.hypervisor = cls.testClient.getHypervisorInfo()
+ if cls.hypervisor.lower() in ['hyperv']:
+ raise unittest.SkipTest("Snapshots feature is not supported on Hyper-V")
cls.services = Services().services
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
@@ -345,13 +347,17 @@ class TestCreateSnapshot(cloudstackTestCase):
self.services["account"],
domainid=self.domain.id
)
+
+ self.apiclient = self.testClient.getUserApiClient(
+ UserName=self.account.name,
+ DomainName=self.account.domain)
self.cleanup = [self.account, ]
return
def tearDown(self):
try:
# Clean up, terminate the created instance, volumes and snapshots
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.api_client, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -615,13 +621,8 @@ class TestCreateSnapshot(cloudstackTestCase):
self.debug("Create a template from snapshot: %s" % snapshot.name)
jobs.append(self.create_Template_from_Snapshot(snapshot))
-
- userapiclient = self.testClient.getUserApiClient(
- UserName=self.account.name,
- DomainName=self.account.domain)
-
# Verify IO usage by submitting the concurrent jobs
- self.testClient.submitCmdsAndWait(jobs, apiclient=userapiclient)
+ self.testClient.submitCmdsAndWait(jobs)
self.debug("Verifying if templates are created properly or not?")
templates = Template.list(