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 C452C10F9C for ; Tue, 25 Nov 2014 13:13:19 +0000 (UTC) Received: (qmail 13708 invoked by uid 500); 25 Nov 2014 13:13:19 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 13674 invoked by uid 500); 25 Nov 2014 13:13:19 -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 13665 invoked by uid 99); 25 Nov 2014 13:13:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Nov 2014 13:13:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5C404A19434; Tue, 25 Nov 2014 13:13:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: talluri@apache.org To: commits@cloudstack.apache.org Message-Id: <9d16cbf37f5546de8a868d557e22fcc4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 6eb4a40 Date: Tue, 25 Nov 2014 13:13:19 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 50ab04dc0 -> 6eb4a40af CLOUDSTACK-7949: Fixing issue in test_base_image_updation.py Signed-off-by: SrikanteswaraRao Talluri Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6eb4a40a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6eb4a40a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6eb4a40a Branch: refs/heads/master Commit: 6eb4a40afe743e4a200730073e084a4d11026219 Parents: 50ab04d Author: Ashutosh K Authored: Thu Nov 20 12:26:22 2014 +0530 Committer: SrikanteswaraRao Talluri Committed: Tue Nov 25 18:43:07 2014 +0530 ---------------------------------------------------------------------- .../component/test_base_image_updation.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6eb4a40a/test/integration/component/test_base_image_updation.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_base_image_updation.py b/test/integration/component/test_base_image_updation.py index 8288f2c..2f92bd2 100644 --- a/test/integration/component/test_base_image_updation.py +++ b/test/integration/component/test_base_image_updation.py @@ -26,7 +26,6 @@ #Import Local Modules from marvin.codes import (PASS, - FAIL, RECURRING) from nose.plugins.attrib import attr from marvin.cloudstackTestCase import cloudstackTestCase @@ -441,7 +440,7 @@ class TestBaseImageUpdate(cloudstackTestCase): template.id )) template.download(self.apiclient) - self.cleanup.append(template) + self._cleanup.append(template) # Wait for template status to be changed across time.sleep(self.services["sleep"]) @@ -650,13 +649,13 @@ class TestBaseImageUpdate(cloudstackTestCase): Here we are passing root disk id of vm before reboot which does not exist hence\ listing should fail") - try: + with self.assertRaises(Exception): listSnapshotPolicies = SnapshotPolicy.list( self.apiclient, volumeid=vm_with_reset_root_disk_id) - except Exception as e: - self.fail("Failed to list snapshot policies: %s" % e) - - self.assertEqual(validateList(listSnapshotPolicies)[0], FAIL,\ - "Snapshot policies list should be empty") + self.assertEqual( + validateList(listSnapshotPolicies)[0], + PASS, + "snapshot policies list validation failed" + ) return