selfhosted
/
coder
mirror of https://github.com/coder/coder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test: Merge env maps to simplify (#5481)

This commit is contained in:
Mathias Fredriksson 2022-12-20 22:40:41 +02:00 committed by GitHub
parent 2ac31684f4
commit 935bb99bed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cli/root_test.go
View File

@ -77,23 +77,23 @@ ExtractCommandPathsLoop:
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
env := make(map[string]string)
for k, v := range commonEnv {
env[k] = v
}
for k, v := range tt.env {
env[k] = v
}
// Unset all CODER_ environment variables for a clean slate.
for _, kv := range os.Environ() {
name := strings.Split(kv, "=")[0]
if _, ok := tt.env[name]; !ok && strings.HasPrefix(name, "CODER_") {
if _, ok := env[name]; !ok && strings.HasPrefix(name, "CODER_") {
t.Setenv(name, "")
}
}
// Override environment variables for a reproducible test.
for k, v := range commonEnv {
if tt.env != nil {
if _, ok := tt.env[k]; ok {
continue
}
}
t.Setenv(k, v)
}
for k, v := range tt.env {
for k, v := range env {
t.Setenv(k, v)
}