cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/4.2 to 582e3a3
Date Thu, 01 Aug 2013 10:53:43 GMT
Updated Branches:
  refs/heads/4.2 712d96294 -> 582e3a37a


Include the exception from urllib in wget test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit eb5099a2a25ac509e7455d0652d90b361ec3971d)


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

Branch: refs/heads/4.2
Commit: 582e3a37a44c0db15d6a45a4ff1d12c3f7762621
Parents: 712d962
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Thu Aug 1 16:23:16 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Thu Aug 1 16:23:33 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_vpc_network_lbrules.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/582e3a37/test/integration/component/test_vpc_network_lbrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_lbrules.py b/test/integration/component/test_vpc_network_lbrules.py
index 5aa626a..de29ce1 100644
--- a/test/integration/component/test_vpc_network_lbrules.py
+++ b/test/integration/component/test_vpc_network_lbrules.py
@@ -339,14 +339,14 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         try:
             urllib.urlretrieve("http://%s/test.html" % public_ip.ipaddress.ipaddress, filename="test.html")
             if not testnegative:
-                self.debug("Successesfull to wget from VM=%s http server on public_ip=%s"
% (vm.name, public_ip.ipaddress.ipaddress))
+                self.debug("Successful to wget from VM=%s http server on public_ip=%s" %
(vm.name, public_ip.ipaddress.ipaddress))
             else:
-                self.fail("Successesfull to wget from VM=%s http server on public_ip=%s"
% (vm.name, public_ip.ipaddress.ipaddress))
-        except:
+                self.fail("Successful to wget from VM=%s http server on public_ip=%s" % (vm.name,
public_ip.ipaddress.ipaddress))
+        except Exception, e:
             if not testnegative:
-                self.fail("Failed to wget from VM=%s http server on public_ip=%s" % (vm.name,
public_ip.ipaddress.ipaddress))
+                self.fail("Failed to wget from VM=%s http server on public_ip=%s because
of %s" % (vm.name, public_ip.ipaddress.ipaddress, e))
             else:
-                self.debug("Failed to wget from VM=%s http server on public_ip=%s" % (vm.name,
public_ip.ipaddress.ipaddress))
+                self.debug("Failed to wget from VM=%s http server on public_ip=%s because
of %s" % (vm.name, public_ip.ipaddress.ipaddress, e))
 
     def create_StaticNatRule_For_VM(self, vm, public_ip, network):
         self.debug("Enabling static NAT for IP: %s" %


Mime
View raw message