mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
6e2fe84ebd
prefixArgs uses os.Setenv in e2e tests instead envMap. This creates overwrites in some test cases and have an impact on test quality and isolation between tests. This PR uses ctlcontext envMap in each tests with high priority and merges os environment variables with low priority.
69 lines
2.1 KiB
Go
69 lines
2.1 KiB
Go
// Copyright 2017 The etcd Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//go:build !cov
|
|
// +build !cov
|
|
|
|
package e2e
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"go.etcd.io/etcd/pkg/v3/expect"
|
|
"go.uber.org/zap"
|
|
)
|
|
|
|
const noOutputLineCount = 0 // regular binaries emit no extra lines
|
|
|
|
func spawnCmd(args []string, envVars map[string]string) (*expect.ExpectProcess, error) {
|
|
return spawnCmdWithLogger(zap.NewNop(), args, envVars)
|
|
}
|
|
|
|
func spawnCmdWithLogger(lg *zap.Logger, args []string, envVars map[string]string) (*expect.ExpectProcess, error) {
|
|
wd, err := os.Getwd()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
env := mergeEnvVariables(envVars)
|
|
if strings.HasSuffix(args[0], "/etcdctl3") {
|
|
env = append(env, "ETCDCTL_API=3")
|
|
lg.Info("spawning process with ETCDCTL_API=3", zap.Strings("args", args), zap.String("working-dir", wd), zap.Strings("environment-variables", env))
|
|
return expect.NewExpectWithEnv(ctlBinPath, args[1:], env)
|
|
}
|
|
lg.Info("spawning process", zap.Strings("args", args), zap.String("working-dir", wd), zap.Strings("environment-variables", env))
|
|
return expect.NewExpectWithEnv(args[0], args[1:], env)
|
|
}
|
|
|
|
func mergeEnvVariables(envVars map[string]string) []string {
|
|
var env []string
|
|
// Environment variables are passed as parameter have higher priority
|
|
// than os environment variables.
|
|
for k, v := range envVars {
|
|
env = append(env, fmt.Sprintf("%s=%s", k, v))
|
|
}
|
|
|
|
// Now, we can set os environment variables not passed as parameter.
|
|
currVars := os.Environ()
|
|
for _, v := range currVars {
|
|
p := strings.Split(v, "=")
|
|
if _, ok := envVars[p[0]]; !ok {
|
|
env = append(env, fmt.Sprintf("%s=%s", p[0], p[1]))
|
|
}
|
|
}
|
|
|
|
return env
|
|
}
|