You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2014/11/11 04:52:35 UTC
ambari git commit: AMBARI-8263. Unit Test Failures in
branch-windows-dev (Jayush Luniya via alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-windows-dev 5ab763de6 -> 045fcb8d8
AMBARI-8263. Unit Test Failures in branch-windows-dev (Jayush Luniya via alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/045fcb8d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/045fcb8d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/045fcb8d
Branch: refs/heads/branch-windows-dev
Commit: 045fcb8d828221bccf9642d1bb6c30aeda5c15c4
Parents: 5ab763d
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Mon Nov 10 19:23:04 2014 -0800
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Mon Nov 10 19:23:04 2014 -0800
----------------------------------------------------------------------
.../python/resource_management/libraries/providers/xml_config.py | 1 +
.../org/apache/ambari/server/configuration/Configuration.java | 2 +-
.../controller/internal/ClientConfigResourceProviderTest.java | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/045fcb8d/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
index a7b2c21..1be60fa 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
@@ -21,6 +21,7 @@ Ambari Agent
"""
import time
+import os
from resource_management import *
class XmlConfigProvider(Provider):
http://git-wip-us.apache.org/repos/asf/ambari/blob/045fcb8d/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 56bb5ab..90abe2c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -72,7 +72,7 @@ public class Configuration {
public static final String STACK_ADVISOR_SCRIPT = "stackadvisor.script";
public static final String STACK_ADVISOR_SCRIPT_DEFAULT = "/var/lib/ambari-server/resources/scripts/stack_advisor.py";
public static final String AMBARI_PYTHON_WRAP_KEY = "ambari.python.wrap";
- public static final String AMBARI_PYTHON_WRAP_DEFAULT = "python";
+ public static final String AMBARI_PYTHON_WRAP_DEFAULT = "ambari-python-wrap";
public static final String API_AUTHENTICATE = "api.authenticate";
public static final String API_USE_SSL = "api.ssl";
public static final String API_CSRF_PREVENTION_KEY = "api.csrfPrevention.enabled";
http://git-wip-us.apache.org/repos/asf/ambari/blob/045fcb8d/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
index 14f5082..2775a1e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
@@ -221,7 +221,8 @@ public class ClientConfigResourceProviderTest {
expect(configHelper.getEffectiveConfigProperties(cluster, configTags)).andReturn(properties);
expect(clusterConfig.getType()).andReturn(Configuration.HIVE_CONFIG_TAG).anyTimes();
expect(configHelper.getEffectiveConfigAttributes(cluster, configTags)).andReturn(attributes);
- expect(configuration.getProperty("server.tmp.dir")).andReturn(Configuration.SERVER_TMP_DIR_DEFAULT);
+ expect(configuration.getProperty(Configuration.SERVER_TMP_DIR_KEY)).andReturn(Configuration.SERVER_TMP_DIR_DEFAULT);
+ expect(configuration.getProperty(Configuration.AMBARI_PYTHON_WRAP_KEY)).andReturn(Configuration.AMBARI_PYTHON_WRAP_DEFAULT);
Map<String,String> props = new HashMap<String, String>();
props.put(Configuration.HIVE_METASTORE_PASSWORD_PROPERTY, "pass");
props.put("key","value");