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 E339510619 for ; Wed, 8 May 2013 12:00:21 +0000 (UTC) Received: (qmail 24304 invoked by uid 500); 8 May 2013 12:00:13 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 24199 invoked by uid 500); 8 May 2013 12:00:13 -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 8820 invoked by uid 99); 8 May 2013 11:59:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 May 2013 11:59:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1BE398899EC; Wed, 8 May 2013 11:59:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Date: Wed, 08 May 2013 12:00:51 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [82/90] [abbrv] git commit: updated refs/heads/marvin_refactor to 26ea081 CLOUDSTACK-2361: fix storage xenmotion test script Signed-off-by: Prasanna Santhanam Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8be30443 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8be30443 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8be30443 Branch: refs/heads/marvin_refactor Commit: 8be304434e808660f17c5753abbf455a49ed7602 Parents: 93db64f Author: Talluri Authored: Wed May 8 02:41:02 2013 +0530 Committer: Prasanna Santhanam Committed: Wed May 8 14:26:43 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_storage_motion.py | 17 +++++++++++++-- 1 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8be30443/test/integration/component/test_storage_motion.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_storage_motion.py b/test/integration/component/test_storage_motion.py index 086ec77..c05d79e 100644 --- a/test/integration/component/test_storage_motion.py +++ b/test/integration/component/test_storage_motion.py @@ -98,16 +98,16 @@ class TestStorageMotion(cloudstackTestCase): # Get Zone, Domain and templates domain = get_domain(cls.api_client, cls.services) - zone = get_zone(cls.api_client, cls.services) + cls.zone = get_zone(cls.api_client, cls.services) cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, - zone.id, + cls.zone.id, cls.services["ostype"] ) # Set Zones and disk offerings - cls.services["small"]["zoneid"] = zone.id + cls.services["small"]["zoneid"] = cls.zone.id cls.services["small"]["template"] = template.id # Create VMs, NAT Rules etc @@ -258,6 +258,17 @@ class TestStorageMotion(cloudstackTestCase): self.apiclient, id=volume.id ) + self.assertEqual( + isinstance(pools, list), + True, + "Check list storage pools response for valid list" + ) + self.assertNotEqual( + pools, + None, + "Check if pools exists in ListStoragePools" + ) + pool = pools[0] self.debug("Migrating Volume-ID: %s to Pool: %s" % ( volume.id,