Merge pull request #114859 from pohly/e2e-ginkgo-spec-ordering

dependencies: update ginkgo to v2.7.0
This commit is contained in:
Kubernetes Prow Robot
2023-01-10 15:25:37 -08:00
committed by GitHub
41 changed files with 365 additions and 100 deletions

View File

@@ -21,7 +21,6 @@ import (
"fmt"
"math/rand"
"path/filepath"
"sort"
"strconv"
"strings"
"sync"
@@ -109,19 +108,6 @@ var setupLocalVolumeMap = map[localVolumeType]utils.LocalVolumeType{
BlockFsWithoutFormatLocalVolumeType: utils.LocalVolumeBlock, // block device in Filesystem mode (default in this test suite)
}
// setupLocalVolumeMapKeys returns all keys in a sorted slice. This is needed
// to define tests in a deterministic order.
func setupLocalVolumeMapKeys() []localVolumeType {
var keys []localVolumeType
for key := range setupLocalVolumeMap {
keys = append(keys, key)
}
sort.Slice(keys, func(i, j int) bool {
return keys[i] < keys[j]
})
return keys
}
type localTestVolume struct {
// Local test resource
ltr *utils.LocalTestResource
@@ -195,7 +181,7 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() {
}
})
for _, tempTestVolType := range setupLocalVolumeMapKeys() {
for tempTestVolType := range setupLocalVolumeMap {
// New variable required for gingko test closures
testVolType := tempTestVolType