Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-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 CBB521897E for ; Thu, 18 Feb 2016 21:54:11 +0000 (UTC) Received: (qmail 85051 invoked by uid 500); 18 Feb 2016 21:54:11 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 85016 invoked by uid 500); 18 Feb 2016 21:54:11 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 85006 invoked by uid 99); 18 Feb 2016 21:54:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2016 21:54:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8BE63DFF67; Thu, 18 Feb 2016 21:54:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: odiachenko@apache.org To: commits@ambari.apache.org Message-Id: <391fa18952b44ec0af8d8528ef2910bd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-15080. HBase unittest fails when using python 2.6(Lav Jain via odiachenko). Date: Thu, 18 Feb 2016 21:54:11 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 6d121dd6e -> defbeddae AMBARI-15080. HBase unittest fails when using python 2.6(Lav Jain via odiachenko). Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/defbedda Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/defbedda Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/defbedda Branch: refs/heads/trunk Commit: defbeddae55d110b3323b389c2666071eec6883d Parents: 6d121dd Author: Oleksandr Diachenko Authored: Thu Feb 18 13:54:05 2016 -0800 Committer: Oleksandr Diachenko Committed: Thu Feb 18 13:54:05 2016 -0800 ---------------------------------------------------------------------- .../python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/defbedda/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py index 7722af0..6c3ad89 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py @@ -18,7 +18,8 @@ See the License for the specific language governing permissions and limitations under the License. ''' import json -from unittest import SkipTest +import sys +import unittest from mock.mock import MagicMock, patch from stacks.utils.RMFTestCase import * @@ -152,7 +153,11 @@ class TestPhoenixQueryServer(RMFTestCase): self.assertNoMoreResources() def test_start_default_24(self): - raise SkipTest("there's nothing to upgrade to yet") + if sys.version_info >= (2, 7): + raise unittest.SkipTest("there's nothing to upgrade to yet") + else: + # skiptest functionality is not available with Python 2.6 unittest + return self.executeScript( self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/phoenix_queryserver.py",