public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix random order for pod environment tests

This commit is contained in:
Felix Kunde 2020-07-30 16:59:47 +02:00
parent 47b11f7f89
commit ce415eb9b4
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cluster/k8sres.go
View File

@ -780,7 +780,7 @@ func deduplicateEnvVars(input []v1.EnvVar, containerName string, logger *logrus.
} else if names[va.Name] == 1 { } else if names[va.Name] == 1 {
names[va.Name]++ names[va.Name]++
// Some variables (those to configure the WAL_ and LOG_ shipping) may be overriden, only log as info // Some variables (those to configure the WAL_ and LOG_ shipping) may be overwritten, only log as info
if strings.HasPrefix(va.Name, "WAL_") || strings.HasPrefix(va.Name, "LOG_") { if strings.HasPrefix(va.Name, "WAL_") || strings.HasPrefix(va.Name, "LOG_") {
logger.Infof("global variable %q has been overwritten by configmap/secret for container %q", logger.Infof("global variable %q has been overwritten by configmap/secret for container %q",
va.Name, containerName) va.Name, containerName)

14
pkg/cluster/k8sres_test.go
View File

@ -5,6 +5,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"reflect" "reflect"
"sort"
"testing" "testing"
@ -749,7 +750,8 @@ func (c *mockConfigMap) Get(ctx context.Context, name string, options metav1.Get
configmap := &v1.ConfigMap{} configmap := &v1.ConfigMap{}
configmap.Name = testPodEnvironmentConfigMapName configmap.Name = testPodEnvironmentConfigMapName
configmap.Data = map[string]string{ configmap.Data = map[string]string{
"foo": "bar", "foo1": "bar1",
"foo2": "bar2",
} }
return configmap, nil return configmap, nil
} }
@ -816,8 +818,12 @@ func TestPodEnvironmentConfigMapVariables(t *testing.T) {
}, },
envVars: []v1.EnvVar{ envVars: []v1.EnvVar{
{ {
Name: "foo", Name: "foo1",
Value: "bar", Value: "bar1",
},
{
Name: "foo2",
Value: "bar2",
}, },
}, },
}, },
@ -825,6 +831,7 @@ func TestPodEnvironmentConfigMapVariables(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
c := newMockCluster(tt.opConfig) c := newMockCluster(tt.opConfig)
vars, err := c.getPodEnvironmentConfigMapVariables() vars, err := c.getPodEnvironmentConfigMapVariables()
sort.Slice(vars, func(i, j int) bool { return vars[i].Name < vars[j].Name })
if !reflect.DeepEqual(vars, tt.envVars) { if !reflect.DeepEqual(vars, tt.envVars) {
t.Errorf("%s %s: expected `%v` but got `%v`", t.Errorf("%s %s: expected `%v` but got `%v`",
testName, tt.subTest, tt.envVars, vars) testName, tt.subTest, tt.envVars, vars)
@ -902,6 +909,7 @@ func TestPodEnvironmentSecretVariables(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
c := newMockCluster(tt.opConfig) c := newMockCluster(tt.opConfig)
vars, err := c.getPodEnvironmentSecretVariables() vars, err := c.getPodEnvironmentSecretVariables()
sort.Slice(vars, func(i, j int) bool { return vars[i].Name < vars[j].Name })
if !reflect.DeepEqual(vars, tt.envVars) { if !reflect.DeepEqual(vars, tt.envVars) {
t.Errorf("%s %s: expected `%v` but got `%v`", t.Errorf("%s %s: expected `%v` but got `%v`",
testName, tt.subTest, tt.envVars, vars) testName, tt.subTest, tt.envVars, vars)