Revert "e2e storage: define local PersistentVolume tests in deterministic order"
This reverts commit 5636418f10
. Ginkgo is
now handling the random spec ordering.
This commit is contained in:
parent
baf832d80d
commit
cb1edc00ef
@ -21,7 +21,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"sort"
|
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
@ -109,19 +108,6 @@ var setupLocalVolumeMap = map[localVolumeType]utils.LocalVolumeType{
|
|||||||
BlockFsWithoutFormatLocalVolumeType: utils.LocalVolumeBlock, // block device in Filesystem mode (default in this test suite)
|
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 {
|
type localTestVolume struct {
|
||||||
// Local test resource
|
// Local test resource
|
||||||
ltr *utils.LocalTestResource
|
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
|
// New variable required for gingko test closures
|
||||||
testVolType := tempTestVolType
|
testVolType := tempTestVolType
|
||||||
|
Loading…
Reference in New Issue
Block a user