You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/02/19 14:26:32 UTC
[15/21] ambari git commit: AMBARI-15080. HBase unittest fails when
using python 2.6(Lav Jain via odiachenko).
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/branch-dev-patch-upgrade
Commit: defbeddae55d110b3323b389c2666071eec6883d
Parents: 6d121dd
Author: Oleksandr Diachenko <od...@pivotal.io>
Authored: Thu Feb 18 13:54:05 2016 -0800
Committer: Oleksandr Diachenko <od...@pivotal.io>
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",