Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15645 from serathius/tests-cleanup-alternative-binaries

Browse Source 
tests/framework: Cleanup alternative binaries in e2e tests
This commit is contained in:
Marek Siarkowicz 2023-04-06 07:33:17 +02:00 committed by GitHub
commit 2d9aeec91f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/framework/e2e/etcd_spawn.go
View File

@ -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)
}

7
tests/framework/e2e/flags.go
View File

@ -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"

4
tests/framework/e2e/util.go
View File

@ -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
}