Updated Branches: refs/heads/trunk 43cbbdeb8 -> 2df4a6e09
AMBARI-3217. ambari-server unit tests produce leave behind an ambari.properties file within the enlistment. Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/3cf02594 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/3cf02594 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/3cf02594 Branch: refs/heads/trunk Commit: 3cf02594eb1f8e955a94bbe4749bbbc6940bbd60 Parents: 43cbbde Author: Sumit Mohanty <[email protected]> Authored: Thu Sep 12 16:04:36 2013 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Thu Sep 12 16:04:36 2013 -0700 ---------------------------------------------------------------------- ambari-server/src/test/python/TestAmbariServer.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/3cf02594/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 0ce4aeb..0034388 100644 --- a/ambari-server/src/test/python/TestAmbariServer.py +++ b/ambari-server/src/test/python/TestAmbariServer.py @@ -4051,7 +4051,8 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV @patch.object(ambari_server, "store_password_file") @patch("sys.exit") @patch('__builtin__.raw_input') - def test_ambariServerSetupWithCustomDbName(self, raw_input, exit_mock, store_password_file_mock, get_is_secure_mock, setup_db_mock, is_root_mock, is_local_database_mock, + def test_ambariServerSetupWithCustomDbName(self, raw_input, exit_mock, store_password_file_mock, + get_is_secure_mock, setup_db_mock, is_root_mock, is_local_database_mock, check_selinux_mock, check_jdbc_drivers_mock, check_ambari_user_mock, check_iptables_mock, check_postgre_up_mock, configure_postgres_mock, download_jdk_mock, configure_os_settings_mock, get_YN_input, @@ -4088,10 +4089,6 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV f.write("server.jdbc.database=oldDBName") f.close() - with open(ambari_server.AMBARI_PROPERTIES_FILE, "w") as f: - f.write("server.jdbc.database=oldDBName") - f.close() - os.environ[ambari_server.AMBARI_CONF_VAR] = tempdir try:
