Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 39F04113B8 for ; Mon, 12 May 2014 13:13:38 +0000 (UTC) Received: (qmail 48735 invoked by uid 500); 12 May 2014 13:06:58 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 48709 invoked by uid 500); 12 May 2014 13:06:58 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 48702 invoked by uid 99); 12 May 2014 13:06:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 May 2014 13:06:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5DAC081D763; Mon, 12 May 2014 13:06:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4-forward to afd9d4e Date: Mon, 12 May 2014 13:06:58 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4-forward aaa2f5932 -> afd9d4e75 CLOUDSTACK-6627 catch exception instead of checking response Signed-off-by: santhosh Signed-off-by: Daan Hoogland Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/afd9d4e7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/afd9d4e7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/afd9d4e7 Branch: refs/heads/4.4-forward Commit: afd9d4e7567007604e15761a33ce9314149f7e21 Parents: aaa2f59 Author: santhosh Authored: Mon May 12 20:57:52 2014 +1000 Committer: Daan Hoogland Committed: Mon May 12 15:06:38 2014 +0200 ---------------------------------------------------------------------- test/integration/smoke/test_pvlan.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/afd9d4e7/test/integration/smoke/test_pvlan.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_pvlan.py b/test/integration/smoke/test_pvlan.py index a1c146b..9178e62 100644 --- a/test/integration/smoke/test_pvlan.py +++ b/test/integration/smoke/test_pvlan.py @@ -81,5 +81,5 @@ class TestPVLAN(cloudstackTestCase): createNetworkCmd.startipv6="fc00:1234::10" createNetworkCmd.endipv6="fc00:1234::20" err = 0 - createNetworkResponse = self.apiClient.createNetwork(createNetworkCmd) - self.assertEqual(createNetworkResponse, FAILED, "Creating PVLAN with IPv6 should fail") + with self.assertRaises(Exception): + self.apiClient.createNetwork(createNetworkCmd)