cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject git commit: updated refs/heads/4.2 to 6ac099e
Date Fri, 15 Nov 2013 06:00:47 GMT
Updated Branches:
  refs/heads/4.2 1106116b4 -> 6ac099e44


CLOUDSTACK-5169: Egress rules - Improved assertion code
 related to SSH to avoid assertion error


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

Branch: refs/heads/4.2
Commit: 6ac099e44c576b70e99779b6c14d1e38d6d6c95d
Parents: 1106116
Author: Ashutosh K <ashutosh@clogeny.com>
Authored: Fri Nov 15 11:28:07 2013 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Fri Nov 15 11:30:33 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_egress_rules.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ac099e4/test/integration/component/test_egress_rules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_egress_rules.py b/test/integration/component/test_egress_rules.py
index eb38c1a..590f72a 100644
--- a/test/integration/component/test_egress_rules.py
+++ b/test/integration/component/test_egress_rules.py
@@ -1439,8 +1439,7 @@ class TestMultipleAccountsEgressRuleNeg(cloudstackTestCase):
         try:
             self.debug("SSHing into VM type B from VM A")
             self.debug("VM IP: %s" % self.virtual_machineB.ssh_ip)
-            res = ssh.execute("ssh %s@%s" % (
-                                self.services["virtual_machine"]["username"],
+            res = ssh.execute("ssh -o 'BatchMode=yes' %s" % (
                                 self.virtual_machineB.ssh_ip
                                 ))
             self.debug("SSH result: %s" % str(res))
@@ -1450,10 +1449,14 @@ class TestMultipleAccountsEgressRuleNeg(cloudstackTestCase):
                       (self.virtual_machineA.ipaddress, e)
                       )
         result = str(res)
-        self.assertEqual(
-                    result.count("Connection timed out"),
-                    1,
-                    "SSH into management server from VM should not be successful"
+
+        # SSH failure may result in one of the following three error messages
+        ssh_failure_result_set = ["ssh: connect to host %s port 22: No route to host" % self.virtual_machineB.ssh_ip,
+                                  "ssh: connect to host %s port 22: Connection timed out"
% self.virtual_machineB.ssh_ip,
+                                  "Host key verification failed."]
+
+        self.assertFalse(set(res).isdisjoint(ssh_failure_result_set),
+                    "SSH into VM of other account should not be successful"
                     )
         return
 


Mime
View raw message