You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/10/21 04:45:51 UTC
[04/17] git commit: updated refs/heads/4.8 to a664e03
fix ping tests to properly recognise successful ping test
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/47104cf2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/47104cf2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/47104cf2
Branch: refs/heads/4.8
Commit: 47104cf2b359800be55b34a546a7085a67add86b
Parents: 7a1efd6
Author: Paul Angus <pa...@shapeblue.com>
Authored: Mon Sep 26 12:08:41 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Oct 5 15:11:00 2016 +0530
----------------------------------------------------------------------
test/integration/smoke/test_password_server.py | 4 ++--
test/integration/smoke/test_router_dhcphosts.py | 4 ++--
test/integration/smoke/test_routers_network_ops.py | 8 ++++----
test/integration/smoke/test_vpc_redundant.py | 4 ++--
test/integration/smoke/test_vpc_router_nics.py | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47104cf2/test/integration/smoke/test_password_server.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_password_server.py b/test/integration/smoke/test_password_server.py
index c10478f..a85bd54 100644
--- a/test/integration/smoke/test_password_server.py
+++ b/test/integration/smoke/test_password_server.py
@@ -180,12 +180,12 @@ class TestIsolatedNetworksPasswdServer(cloudstackTestCase):
ssh = vm.get_ssh_client(ipaddress=nat_rule.ipaddress, port=self.services[rule_label]["publicport"], retries=5)
result = str(ssh.execute(ssh_command))
- self.logger.debug("SSH result: %s; COUNT is ==> %s" % (result, result.count("3 packets received")))
+ self.logger.debug("SSH result: %s; COUNT is ==> %s" % (result, result.count(" 0% packet loss")))
except:
self.fail("Failed to SSH into VM - %s" % (nat_rule.ipaddress))
self.assertEqual(
- result.count("3 packets received"),
+ result.count(" 0% packet loss"),
1,
"Ping to outside world from VM should be successful"
)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47104cf2/test/integration/smoke/test_router_dhcphosts.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_router_dhcphosts.py b/test/integration/smoke/test_router_dhcphosts.py
index 1681674..c90599b 100644
--- a/test/integration/smoke/test_router_dhcphosts.py
+++ b/test/integration/smoke/test_router_dhcphosts.py
@@ -188,12 +188,12 @@ class TestRouterDHCPHosts(cloudstackTestCase):
ssh = vm.get_ssh_client(ipaddress=nat_rule.ipaddress, port=self.services[rule_label]["publicport"], retries=5)
result = str(ssh.execute(ssh_command))
- self.logger.debug("SSH result: %s; COUNT is ==> %s" % (result, result.count("3 packets received")))
+ self.logger.debug("SSH result: %s; COUNT is ==> %s" % (result, result.count(" 0% packet loss")))
except:
self.fail("Failed to SSH into VM - %s" % (nat_rule.ipaddress))
self.assertEqual(
- result.count("3 packets received"),
+ result.count(" 0% packet loss"),
1,
"Ping to outside world from VM should be successful"
)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47104cf2/test/integration/smoke/test_routers_network_ops.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers_network_ops.py b/test/integration/smoke/test_routers_network_ops.py
index 94c0774..a15150d 100644
--- a/test/integration/smoke/test_routers_network_ops.py
+++ b/test/integration/smoke/test_routers_network_ops.py
@@ -270,7 +270,7 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
# Test SSH after closing port 22
expected = 1
ssh_command = "ping -c 3 8.8.8.8"
- check_string = "3 packets received"
+ check_string = " 0% packet loss"
result = check_router_command(virtual_machine, nat_rule.ipaddress, ssh_command, check_string, self)
self.assertEqual(
@@ -434,7 +434,7 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
expected = 0
ssh_command = "ping -c 3 8.8.8.8"
- check_string = "3 packets received"
+ check_string = " 0% packet loss"
result = check_router_command(virtual_machine, nat_rule.ipaddress, ssh_command, check_string, self)
self.assertEqual(
@@ -822,7 +822,7 @@ class TestIsolatedNetworks(cloudstackTestCase):
# Test SSH after closing port 22
expected = 1
ssh_command = "ping -c 3 8.8.8.8"
- check_string = "3 packets received"
+ check_string = " 0% packet loss"
result = check_router_command(virtual_machine, nat_rule.ipaddress, ssh_command, check_string, self)
self.assertEqual(
@@ -977,7 +977,7 @@ class TestIsolatedNetworks(cloudstackTestCase):
expected = 0
ssh_command = "ping -c 3 8.8.8.8"
- check_string = "3 packets received"
+ check_string = " 0% packet loss"
result = check_router_command(virtual_machine, nat_rule.ipaddress, ssh_command, check_string, self)
self.assertEqual(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47104cf2/test/integration/smoke/test_vpc_redundant.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vpc_redundant.py b/test/integration/smoke/test_vpc_redundant.py
index fbaa5b9..9e4038a 100644
--- a/test/integration/smoke/test_vpc_redundant.py
+++ b/test/integration/smoke/test_vpc_redundant.py
@@ -695,14 +695,14 @@ class TestVPCRedundancy(cloudstackTestCase):
self.logger.debug("Ping to google.com from VM")
result = str(ssh.execute(ssh_command))
- self.logger.debug("SSH result: %s; COUNT is ==> %s" % (result, result.count("3 packets received")))
+ self.logger.debug("SSH result: %s; COUNT is ==> %s" % (result, result.count(" 0% packet loss")))
except Exception as e:
self.fail("SSH Access failed for %s: %s" % \
(vmObj.get_ip(), e)
)
self.assertEqual(
- result.count("3 packets received"),
+ result.count(" 0% packet loss"),
1,
"Ping to outside world from VM should be successful"
)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47104cf2/test/integration/smoke/test_vpc_router_nics.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vpc_router_nics.py b/test/integration/smoke/test_vpc_router_nics.py
index cb0734d..39a9214 100644
--- a/test/integration/smoke/test_vpc_router_nics.py
+++ b/test/integration/smoke/test_vpc_router_nics.py
@@ -464,14 +464,14 @@ class TestVPCNics(cloudstackTestCase):
self.logger.debug("Ping to google.com from VM")
result = str(ssh.execute(ssh_command))
- self.logger.debug("SSH result: %s; COUNT is ==> %s" % (result, result.count("3 packets received")))
+ self.logger.debug("SSH result: %s; COUNT is ==> %s" % (result, result.count(" 0% packet loss")))
except Exception as e:
self.fail("SSH Access failed for %s: %s" % \
(vmObj.get_ip(), e)
)
self.assertEqual(
- result.count("3 packets received"),
+ result.count(" 0% packet loss"),
1,
"Ping to outside world from VM should be successful"
)