apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7134: Fixed test cases for basic zone, services dict was getting overwritten which passed zone type as advanced even in basic zone setup

Browse Source 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
This commit is contained in:
Gaurav Aradhye 2014-09-10 16:29:22 +05:30 committed by SrikanteswaraRao Talluri
parent 86bf33bfab
commit 3a3e5cbbbb
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/component/test_reset_ssh_keypair.py
View File

@ -93,7 +93,7 @@ class Services:
"SSHPasswordEnabledTemplate": "SSHKeyPassword",
"sleep": 60,
"timeout": 20,
"mode": 'advanced',
"mode": '',
}
def wait_vm_start(apiclient, vmid, timeout, sleep):
@ -232,7 +232,6 @@ class TestResetSSHKeypair(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
self.services = Services().services
self.keypair = SSHKeyPair.create(
self.apiclient,
@ -1047,7 +1046,6 @@ class TestResetSSHKeyUserRights(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
self.services = Services().services
# Set Zones and disk offerings
self.services["virtual_machine"]["zoneid"] = self.zone.id
@ -1090,8 +1088,6 @@ class TestResetSSHKeyUserRights(cloudstackTestCase):
self.cleanup.append(self.user_account)
self.debug("Account created: %s" % self.user_account.name)
self.services = Services().services
# Spawn an instance
virtual_machine = VirtualMachine.create(
self.apiclient,