Repository: ambari Updated Branches: refs/heads/trunk 751e69209 -> bd7b8693c
AMBARI-15553. Oozie Unit Test Failures (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bd7b8693 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd7b8693 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd7b8693 Branch: refs/heads/trunk Commit: bd7b8693c9a2453066af6e42a65df4e8449f7286 Parents: 751e692 Author: Andrew Onishuk <[email protected]> Authored: Thu Mar 24 15:56:38 2016 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Thu Mar 24 15:57:08 2016 +0200 ---------------------------------------------------------------------- .../resource_management/libraries/functions/oozie_prepare_war.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bd7b8693/ambari-common/src/main/python/resource_management/libraries/functions/oozie_prepare_war.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/oozie_prepare_war.py b/ambari-common/src/main/python/resource_management/libraries/functions/oozie_prepare_war.py index 725d0ee..5ba48b8 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/oozie_prepare_war.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/oozie_prepare_war.py @@ -25,7 +25,7 @@ from resource_management.core import shell from resource_management.core.exceptions import Fail from resource_management.core.resources.system import File from resource_management.libraries.functions import format -from resource_management.libraries.functions.get_user_call_output import get_user_call_output +from resource_management.libraries.functions import get_user_call_output def prepare_war(params): """ @@ -58,7 +58,7 @@ def prepare_war(params): run_prepare_war = True Logger.info(format("Will run prepare war cmd since marker file {prepare_war_cmd_file} is missing.")) - return_code, libext_content, error_output = get_user_call_output(list_libext_command, user=params.oozie_user) + return_code, libext_content, error_output = get_user_call_output.get_user_call_output(list_libext_command, user=params.oozie_user) libext_content = libext_content.strip() if run_prepare_war == False:
