You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/11/28 21:20:23 UTC
[04/24] ambari git commit: AMBARI-22453. ambari-server setup should
surface GPL software agreement (aonishuk)
AMBARI-22453. ambari-server setup should surface GPL software agreement (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4b01b65d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b01b65d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b01b65d
Branch: refs/heads/branch-2.6
Commit: 4b01b65d9bdf7a5a170890dde13492a0871d444a
Parents: 6cc05d9
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Nov 17 13:14:09 2017 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Nov 17 13:14:09 2017 +0200
----------------------------------------------------------------------
ambari-server/src/test/python/TestAmbariServer.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b01b65d/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 eb04771..840b9a6 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -3684,7 +3684,8 @@ class TestAmbariServer(TestCase):
@patch("ambari_server.serverSetup.service_setup")
@patch("ambari_server.serverSetup.read_ambari_user")
@patch("ambari_server.serverSetup.expand_jce_zip_file")
- def test_setup_linux(self, expand_jce_zip_file_mock, read_ambari_user_mock,
+ @patch("ambari_server.serverSetup.write_gpl_license_accepted")
+ def test_setup_linux(self, write_gpl_license_accepted_mock, expand_jce_zip_file_mock, read_ambari_user_mock,
service_setup_mock, adjust_dirs_mock, extract_views_mock, proceedJDBCProperties_mock, is_root_mock,
disable_security_enhancements_mock, check_jdbc_drivers_mock, check_ambari_user_mock,
download_jdk_mock, configure_os_settings_mock, get_ambari_properties_mock,
@@ -3797,6 +3798,7 @@ class TestAmbariServer(TestCase):
check_jdbc_drivers_mock.return_value = 0
download_jdk_mock.return_value = 0
configure_os_settings_mock.return_value = 0
+ write_gpl_license_accepted_mock.return_value = 0
result = setup(args)
@@ -6825,7 +6827,6 @@ class TestAmbariServer(TestCase):
read_ambari_user_method, read_master_key_method,
get_is_persisted_method, get_is_secure_method, exists_mock,
save_passwd_for_alias_method):
-
is_root_method.return_value = True
p = Properties()