diff --git a/tests/framework/e2e/etcd_spawn.go b/tests/framework/e2e/etcd_spawn.go index d7e6e9b5d..73386de7d 100644 --- a/tests/framework/e2e/etcd_spawn.go +++ b/tests/framework/e2e/etcd_spawn.go @@ -23,31 +23,6 @@ import ( "go.etcd.io/etcd/pkg/v3/expect" ) -var ( - initBinPath func(string) binPath - additionalArgs func() ([]string, error) -) - -const noOutputLineCount = 0 // regular binaries emit no extra lines - -func init() { - initBinPath = initBinPathNoCov - additionalArgs = additionalArgsNoCov -} - -func initBinPathNoCov(binDir string) binPath { - return binPath{ - Etcd: binDir + "/etcd", - EtcdLastRelease: binDir + "/etcd-last-release", - Etcdctl: binDir + "/etcdctl", - Etcdutl: binDir + "/etcdutl", - } -} - -func additionalArgsNoCov() ([]string, error) { - return []string{}, nil -} - func SpawnCmd(args []string, envVars map[string]string) (*expect.ExpectProcess, error) { return SpawnNamedCmd(strings.Join(args, "_"), args, envVars) } @@ -62,15 +37,11 @@ func SpawnCmdWithLogger(lg *zap.Logger, args []string, envVars map[string]string return nil, err } - newArgs, err := additionalArgs() - if err != nil { - return nil, err - } env := mergeEnvVariables(envVars) lg.Info("spawning process", zap.Strings("args", args), zap.String("working-dir", wd), zap.String("name", name), zap.Strings("environment-variables", env)) - return expect.NewExpectWithEnv(args[0], append(args[1:], newArgs...), env, name) + return expect.NewExpectWithEnv(args[0], args[1:], env, name) } diff --git a/tests/framework/e2e/flags.go b/tests/framework/e2e/flags.go index d51d28980..ef072f8ad 100644 --- a/tests/framework/e2e/flags.go +++ b/tests/framework/e2e/flags.go @@ -60,7 +60,12 @@ func InitFlags() { flag.StringVar(&CertDir, "cert-dir", certDirDef, "The directory for store certificate files.") flag.Parse() - BinPath = initBinPath(*binDir) + BinPath = binPath{ + Etcd: *binDir + "/etcd", + EtcdLastRelease: *binDir + "/etcd-last-release", + Etcdctl: *binDir + "/etcdctl", + Etcdutl: *binDir + "/etcdutl", + } CertPath = CertDir + "/server.crt" PrivateKeyPath = CertDir + "/server.key.insecure" CaPath = CertDir + "/ca.crt" diff --git a/tests/framework/e2e/util.go b/tests/framework/e2e/util.go index 46ac286f0..94e1156a2 100644 --- a/tests/framework/e2e/util.go +++ b/tests/framework/e2e/util.go @@ -83,8 +83,8 @@ func SpawnWithExpectLines(ctx context.Context, args []string, envVars map[string } l := proc.LineCount() - if len(xs) == 0 && l != noOutputLineCount { // expect no output - return nil, fmt.Errorf("unexpected output from %v (got lines %q, line count %d) %v. Try EXPECT_DEBUG=TRUE", args, lines, l, l != noOutputLineCount) + if len(xs) == 0 && l != 0 { // expect no output + return nil, fmt.Errorf("unexpected output from %v (got lines %q, line count %d). Try EXPECT_DEBUG=TRUE", args, lines, l) } return lines, nil }