mbiryukova/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Fix random order in tests.

Browse source
This commit is contained in:
Mariano Cano 2019-01-10 10:57:06 -08:00
parent 8510e25b3b
commit 6116523055
1 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ca/tls_options_test.go
View file

@ -7,6 +7,7 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"reflect" "reflect"
"sort"
"testing" "testing"
) )
@ -292,8 +293,11 @@ func TestAddFederationToRootCAs(t *testing.T) {
return return
} }
if !reflect.DeepEqual(ctx.Config, tt.want) { if !reflect.DeepEqual(ctx.Config, tt.want) {
// Federated roots are randomly sorted
if !equalPools(ctx.Config.RootCAs, tt.want.RootCAs) || ctx.Config.ClientCAs != nil {
t.Errorf("AddFederationToRootCAs() = %v, want %v", ctx.Config, tt.want) t.Errorf("AddFederationToRootCAs() = %v, want %v", ctx.Config, tt.want)
} }
}
}) })
} }
} }
@ -345,8 +349,11 @@ func TestAddFederationToClientCAs(t *testing.T) {
return return
} }
if !reflect.DeepEqual(ctx.Config, tt.want) { if !reflect.DeepEqual(ctx.Config, tt.want) {
// Federated roots are randomly sorted
if !equalPools(ctx.Config.ClientCAs, tt.want.ClientCAs) || ctx.Config.RootCAs != nil {
t.Errorf("AddFederationToClientCAs() = %v, want %v", ctx.Config, tt.want) t.Errorf("AddFederationToClientCAs() = %v, want %v", ctx.Config, tt.want)
} }
}
}) })
} }
} }
@ -444,8 +451,27 @@ func TestAddFederationToCAs(t *testing.T) {
return return
} }
if !reflect.DeepEqual(ctx.Config, tt.want) { if !reflect.DeepEqual(ctx.Config, tt.want) {
// Federated roots are randomly sorted
if !equalPools(ctx.Config.ClientCAs, tt.want.ClientCAs) || !equalPools(ctx.Config.RootCAs, tt.want.RootCAs) {
t.Errorf("AddFederationToCAs() = %v, want %v", ctx.Config, tt.want) t.Errorf("AddFederationToCAs() = %v, want %v", ctx.Config, tt.want)
} }
}
}) })
} }
} }
func equalPools(a, b *x509.CertPool) bool {
subjects := a.Subjects()
sA := make([]string, len(subjects))
for i := range subjects {
sA[i] = string(subjects[i])
}
subjects = b.Subjects()
sB := make([]string, len(subjects))
for i := range subjects {
sB[i] = string(subjects[i])
}
sort.Sort(sort.StringSlice(sA))
sort.Sort(sort.StringSlice(sB))
return reflect.DeepEqual(sA, sB)
}