From 78380ae6b8e118a32124720a09194f82beb51092 Mon Sep 17 00:00:00 2001 From: Benjamin Wang Date: Thu, 13 Oct 2022 16:33:02 +0800 Subject: [PATCH] functional-test: move the check on log-outputs out of the 'if clientTLS' branch Signed-off-by: Benjamin Wang --- .../functional/tester/cluster_read_config.go | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/functional/tester/cluster_read_config.go b/tests/functional/tester/cluster_read_config.go index 808373c85..874ee48af 100644 --- a/tests/functional/tester/cluster_read_config.go +++ b/tests/functional/tester/cluster_read_config.go @@ -356,17 +356,17 @@ func read(lg *zap.Logger, fpath string) (*Cluster, error) { } clus.Members[i].ClientCertData = string(data) } + } - if len(mem.Etcd.LogOutputs) == 0 { - return nil, fmt.Errorf("mem.Etcd.LogOutputs cannot be empty") - } - for _, v := range mem.Etcd.LogOutputs { - switch v { - case "stderr", "stdout", "/dev/null", "default": - default: - if !strings.HasPrefix(v, mem.BaseDir) { - return nil, fmt.Errorf("LogOutput %q must be prefixed with BaseDir %q", v, mem.BaseDir) - } + if len(mem.Etcd.LogOutputs) == 0 { + return nil, fmt.Errorf("mem.Etcd.LogOutputs cannot be empty") + } + for _, v := range mem.Etcd.LogOutputs { + switch v { + case "stderr", "stdout", "/dev/null", "default": + default: + if !strings.HasPrefix(v, mem.BaseDir) { + return nil, fmt.Errorf("LogOutput %q must be prefixed with BaseDir %q", v, mem.BaseDir) } } }