mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-22 23:52:03 +00:00
update tests
This commit is contained in:
parent
f4da4f1eb0
commit
3269380869
@ -47,7 +47,6 @@ def cluster():
|
|||||||
with_minio=True,
|
with_minio=True,
|
||||||
env_variables={
|
env_variables={
|
||||||
"https_proxy": "http://proxy1",
|
"https_proxy": "http://proxy1",
|
||||||
"no_proxy": "not_important_host,, minio1 ,"
|
|
||||||
},
|
},
|
||||||
instance_env_variables=True,
|
instance_env_variables=True,
|
||||||
)
|
)
|
||||||
@ -74,6 +73,3 @@ def test_s3_with_https_remote_proxy(cluster):
|
|||||||
|
|
||||||
def test_s3_with_https_env_proxy(cluster):
|
def test_s3_with_https_env_proxy(cluster):
|
||||||
proxy_util.simple_test(cluster, ["proxy1"], "https", "env_node")
|
proxy_util.simple_test(cluster, ["proxy1"], "https", "env_node")
|
||||||
|
|
||||||
def test_s3_with_no_proxy(cluster):
|
|
||||||
proxy_util.simple_test_assert_no_proxy(cluster, ["proxy1"], "https", "env_node_no_proxy")
|
|
@ -36,6 +36,16 @@ def cluster():
|
|||||||
instance_env_variables=True,
|
instance_env_variables=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
cluster.add_instance(
|
||||||
|
"env_node_no_proxy",
|
||||||
|
with_minio=True,
|
||||||
|
env_variables={
|
||||||
|
"http_proxy": "http://proxy1",
|
||||||
|
"no_proxy": "not_important_host,, minio1 ,",
|
||||||
|
},
|
||||||
|
instance_env_variables=True,
|
||||||
|
)
|
||||||
|
|
||||||
logging.info("Starting cluster...")
|
logging.info("Starting cluster...")
|
||||||
cluster.start()
|
cluster.start()
|
||||||
logging.info("Cluster started")
|
logging.info("Cluster started")
|
||||||
@ -58,3 +68,7 @@ def test_s3_with_http_remote_proxy(cluster):
|
|||||||
|
|
||||||
def test_s3_with_http_env_proxy(cluster):
|
def test_s3_with_http_env_proxy(cluster):
|
||||||
proxy_util.simple_test(cluster, ["proxy1"], "http", "env_node")
|
proxy_util.simple_test(cluster, ["proxy1"], "http", "env_node")
|
||||||
|
|
||||||
|
|
||||||
|
def test_s3_with_http_no_proxy(cluster):
|
||||||
|
proxy_util.simple_test_assert_no_proxy(cluster, ["proxy1"], "http", "env_node_no_proxy")
|
||||||
|
@ -44,6 +44,19 @@ def cluster():
|
|||||||
instance_env_variables=True,
|
instance_env_variables=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
cluster.add_instance(
|
||||||
|
"env_node_no_proxy",
|
||||||
|
main_configs=[
|
||||||
|
"configs/config.d/ssl.xml",
|
||||||
|
],
|
||||||
|
with_minio=True,
|
||||||
|
env_variables={
|
||||||
|
"https_proxy": "https://proxy1",
|
||||||
|
"no_proxy": "not_important_host,, minio1 ,",
|
||||||
|
},
|
||||||
|
instance_env_variables=True,
|
||||||
|
)
|
||||||
|
|
||||||
logging.info("Starting cluster...")
|
logging.info("Starting cluster...")
|
||||||
cluster.start()
|
cluster.start()
|
||||||
logging.info("Cluster started")
|
logging.info("Cluster started")
|
||||||
@ -66,3 +79,7 @@ def test_s3_with_https_remote_proxy(cluster):
|
|||||||
|
|
||||||
def test_s3_with_https_env_proxy(cluster):
|
def test_s3_with_https_env_proxy(cluster):
|
||||||
proxy_util.simple_test(cluster, ["proxy1"], "https", "env_node")
|
proxy_util.simple_test(cluster, ["proxy1"], "https", "env_node")
|
||||||
|
|
||||||
|
|
||||||
|
def test_s3_with_https_no_proxy(cluster):
|
||||||
|
proxy_util.simple_test_assert_no_proxy(cluster, ["proxy1"], "https", "env_node_no_proxy")
|
||||||
|
Loading…
Reference in New Issue
Block a user