cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/master to 3a3e5cb
Date Mon, 15 Sep 2014 09:28:42 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 86bf33bfa -> 3a3e5cbbb


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

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a3e5cbb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a3e5cbb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a3e5cbb

Branch: refs/heads/master
Commit: 3a3e5cbbbb405854c0d77d37846e524815afe6cf
Parents: 86bf33b
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Wed Sep 10 16:29:22 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Mon Sep 15 14:58:15 2014 +0530

----------------------------------------------------------------------
 test/integration/component/test_reset_ssh_keypair.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a3e5cbb/test/integration/component/test_reset_ssh_keypair.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_reset_ssh_keypair.py b/test/integration/component/test_reset_ssh_keypair.py
index 204690e..20321ac 100644
--- a/test/integration/component/test_reset_ssh_keypair.py
+++ b/test/integration/component/test_reset_ssh_keypair.py
@@ -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,


Mime
View raw message