hoelee/cloudflared
1
0
Fork 0
mirror of https://github.com/cloudflare/cloudflared.git synced 2025-07-27 18:19:57 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

TUN-4062: Read component tests config from yaml file

Browse Source
This commit is contained in:
cthuang
2021-03-08 14:09:10 +00:00
committed by Chung Ting Huang
parent 206523344f
commit a7344435a5
7 changed files with 155 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
component-tests/util.py
View File

@@ -5,11 +5,6 @@ import yaml
LOGGER = logging.getLogger(__name__)
def get_cloudflared():
cfd_binary = os.getenv('CFD_BINARY')
return "cloudflared" if cfd_binary is None else cfd_binary
def write_config(path, config):
config_path = path / "config.yaml"
with open(config_path, 'w') as outfile:
@@ -17,11 +12,15 @@ def write_config(path, config):
return config_path
def start_cloudflared(path, config, args, pre_args=[]):
def start_cloudflared(path, component_test_config, cfd_args, cfd_pre_args=[], classic=False):
if classic:
config = component_test_config.classic_tunnel_config
else:
config = component_test_config.named_tunnel_config
config_path = write_config(path, config)
cmd = [get_cloudflared()]
cmd += pre_args
cmd = [component_test_config.cloudflared_binary]
cmd += cfd_pre_args
cmd += ["--config", config_path]
cmd += args
cmd += cfd_args
LOGGER.info(f"Run cmd {cmd} with config {config}")
return subprocess.run(cmd, capture_output=True)