This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0073f1492c AMBARI-26474: Fix ambari server py test (#4007)
0073f1492c is described below
commit 0073f1492cc1dfd79a803b9cce3a34564f5ab884
Author: jialiang <jialiangca...@gmail.com>
AuthorDate: Mon Apr 21 12:15:58 2025 +0800
AMBARI-26474: Fix ambari server py test (#4007)
---
ambari-server/src/test/python/custom_actions/TestCheckHost.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/ambari-server/src/test/python/custom_actions/TestCheckHost.py
b/ambari-server/src/test/python/custom_actions/TestCheckHost.py
index c8f6781d89..3b9d5011a9 100644
--- a/ambari-server/src/test/python/custom_actions/TestCheckHost.py
+++ b/ambari-server/src/test/python/custom_actions/TestCheckHost.py
@@ -118,7 +118,7 @@ class TestCheckHost(TestCase):
"user_passwd": "test_user_passwd",
"jdk_name": "test_jdk_name",
},
- "ambariLevelParams": {"custom_mysql_jdbc_name":
"mysql-connector-java.jar"},
+ "ambariLevelParams": {"custom_mysql_jdbc_name":
"mysql-connector-java.jar","ambari_java_home": "test_java_home"},
"agentLevelParams": {"agentCacheDir": "/nonexistent_tmp"},
}
get_tmp_dir_mock.return_value = "/tmp"
@@ -158,7 +158,7 @@ class TestCheckHost(TestCase):
"jdk_name": "test_jdk_name",
},
"agentLevelParams": {"agentCacheDir": "/nonexistent_tmp"},
- "ambariLevelParams": {"custom_oracle_jdbc_name":
"oracle-jdbc-driver.jar"},
+ "ambariLevelParams": {"custom_oracle_jdbc_name":
"oracle-jdbc-driver.jar","ambari_java_home": "test_java_home"},
}
format_mock.reset_mock()
download_file_mock.reset_mock()
@@ -197,7 +197,7 @@ class TestCheckHost(TestCase):
"jdk_name": "test_jdk_name",
},
"agentLevelParams": {"agentCacheDir": "/nonexistent_tmp"},
- "ambariLevelParams": {"custom_postgres_jdbc_name":
"oracle-jdbc-driver.jar"},
+ "ambariLevelParams": {"custom_postgres_jdbc_name":
"oracle-jdbc-driver.jar","ambari_java_home": "test_java_home"},
}
format_mock.reset_mock()
download_file_mock.reset_mock()
@@ -251,7 +251,7 @@ class TestCheckHost(TestCase):
"db_name": "postgres",
},
"agentLevelParams": {"agentCacheDir": "/nonexistent_tmp"},
- "ambariLevelParams": {"custom_postgres_jdbc_name":
"test-postgres-jdbc.jar"},
+ "ambariLevelParams": {"custom_postgres_jdbc_name":
"test-postgres-jdbc.jar","ambari_java_home": "test_java_home"},
}
isfile_mock.return_value = False
@@ -615,6 +615,7 @@ class TestCheckHost(TestCase):
"agentCacheDir": "/nonexistent_tmp",
"custom_mysql_jdbc_name": "mysql-connector-java.jar",
},
+ "ambariLevelParams": {"ambari_java_home": "test_java_home"},
}
get_tmp_dir_mock.return_value = "/tmp"
download_file_mock.side_effect = Exception("test exception")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org
For additional commands, e-mail: commits-h...@ambari.apache.org
