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 7FEDA10A16 for ; Thu, 18 Jul 2013 11:35:19 +0000 (UTC) Received: (qmail 49971 invoked by uid 500); 18 Jul 2013 11:35:19 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 49791 invoked by uid 500); 18 Jul 2013 11:35: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 49784 invoked by uid 99); 18 Jul 2013 11:35:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jul 2013 11:35:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4553B8AD45B; Thu, 18 Jul 2013 11:35:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sailajamada@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 69462fd Date: Thu, 18 Jul 2013 11:35:18 +0000 (UTC) Updated Branches: refs/heads/master 6cfcbc665 -> 69462fd0c CLOUDSTACK-3636: Fix invalid condition to check for empty response for private service offerings Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/69462fd0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/69462fd0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/69462fd0 Branch: refs/heads/master Commit: 69462fd0cb17a0e53b42d02e773d87b5a8be14ee Parents: 6cfcbc6 Author: sailajam Authored: Thu Jul 18 16:52:14 2013 +0530 Committer: sailajam Committed: Thu Jul 18 17:01:00 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_accounts.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/69462fd0/test/integration/component/test_accounts.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py index 55b7331..4350c3f 100644 --- a/test/integration/component/test_accounts.py +++ b/test/integration/component/test_accounts.py @@ -824,22 +824,10 @@ class TestServiceOfferingHierarchy(cloudstackTestCase): domainid=self.domain_2.id ) self.assertEqual( - isinstance(service_offerings, list), - True, + service_offerings, + None, "Check List Service Offerings for a valid response" ) - self.assertNotEqual( - len(service_offerings), - 0, - "Check List Service Offerings response" - ) - - for service_offering in service_offerings: - self.assertEqual( - service_offering.id, - self.service_offering.id, - "Check Service offering ID for domain" + str(self.domain_2.name) - ) return