ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amag...@apache.org
Subject [12/45] ambari git commit: AMBARI-22276 Ambari trunk builds failing in TestAmbariServer (additional patch) (dsen)
Date Fri, 05 Jan 2018 07:56:08 GMT
AMBARI-22276 Ambari trunk builds failing in TestAmbariServer (additional patch) (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/415875b6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/415875b6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/415875b6

Branch: refs/heads/branch-feature-AMBARI-22008-isilon
Commit: 415875b696f6799a7b5d4653557dca6377c4eb77
Parents: e04b57b
Author: Dmytro Sen <dsen@apache.org>
Authored: Tue Dec 26 16:25:06 2017 +0200
Committer: Dmytro Sen <dsen@apache.org>
Committed: Tue Dec 26 16:25:06 2017 +0200

----------------------------------------------------------------------
 ambari-server/src/test/python/TestAmbariServer.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/415875b6/ambari-server/src/test/python/TestAmbariServer.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/TestAmbariServer.py b/ambari-server/src/test/python/TestAmbariServer.py
index ad4e371..adda151 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -473,11 +473,13 @@ class TestAmbariServer(TestCase):
   @patch("ambari_server.serverSetup.extract_views")
   @patch("ambari_server.serverSetup.adjust_directory_permissions")
   @patch("ambari_server.serverSetup.service_setup")
-  def test_main_with_preset_dbms(self, service_setup_mock, adjust_directory_permissions_mock,
extract_views_mock, check_jdbc_drivers_mock, setup_database_mock, configure_os_settings_mock,
download_and_install_jdk_mock, check_ambari_user_mock, init_logging_mock, setup_logging_mock,
get_ambari_properties_mock,
+  @patch("ambari_server.serverConfiguration.search_file")
+  def test_main_with_preset_dbms(self, search_file_mock, service_setup_mock, adjust_directory_permissions_mock,
extract_views_mock, check_jdbc_drivers_mock, setup_database_mock, configure_os_settings_mock,
download_and_install_jdk_mock, check_ambari_user_mock, init_logging_mock, setup_logging_mock,
get_ambari_properties_mock,
                                  logger_mock, setup_local_db_method):
     extract_views_mock.return_value = 0
     check_ambari_user_mock.return_value = (0, False, 'user', None)
     configure_os_settings_mock.return_value = 0
+    search_file_mock.return_value = '/tmp/ambari.properties'
     import sys
     tmp_argv = sys.argv
     try:


Mime
View raw message