You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/17 15:57:49 UTC
[4/4] git commit: updated refs/heads/4.2 to 6a185e2
Fixes CLOUDSTACK-3582
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit cfd892fc3b72def40ab4cde78a7b844510bb860a)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a13b8b4e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a13b8b4e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a13b8b4e
Branch: refs/heads/4.2
Commit: a13b8b4e59cd9df3a834b3f7521f0e5e0f186fbe
Parents: 50b5ba6
Author: Sowmya Krishnan <so...@citrix.com>
Authored: Wed Jul 17 12:16:53 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 17 19:27:33 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_netscaler_lb.py | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a13b8b4e/test/integration/component/test_netscaler_lb.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb.py b/test/integration/component/test_netscaler_lb.py
index 146b4c6..4253ada 100644
--- a/test/integration/component/test_netscaler_lb.py
+++ b/test/integration/component/test_netscaler_lb.py
@@ -2778,11 +2778,27 @@ class TestVmWithLb(cloudstackTestCase):
hostnames.append(result)
self.debug("Hostnames: %s" % str(hostnames))
- self.assertNotEqual(
+ if hostnames[0] == hostnames[1]:
+ ssh_3 = self.vm_2.get_ssh_client(
+ ipaddress=self.public_ip_1.ipaddress.ipaddress,
+ reconnect=True
+ )
+ self.debug("Command: hostname")
+ result = ssh_3.execute("hostname")
+ self.debug("Output: %s" % result)
+ hostnames.append(result)
+
+ self.assertNotEqual(
hostnames[0],
- hostnames[1],
+ hostnames[2],
"Both request should be served by different instances"
)
+ else:
+ self.assertNotEqual(
+ hostnames[0],
+ hostnames[1],
+ "Both request should be served by different instances"
+ )
except Exception as e:
self.fail("Exception occured during SSH: %s - %s" % (
self.public_ip_1.ipaddress.ipaddress,