mirror of
https://github.com/rancher/steve.git
synced 2025-07-12 06:08:24 +00:00
adapt tests
Signed-off-by: Silvio Moioli <silvio@moioli.net>
This commit is contained in:
parent
1585ed3f7a
commit
d138622063
@ -1,8 +1,8 @@
|
|||||||
package proxy
|
package proxy
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -88,6 +88,7 @@ func receiveUntil(wc chan watch.Event, d time.Duration) error {
|
|||||||
timer := time.NewTicker(d)
|
timer := time.NewTicker(d)
|
||||||
defer timer.Stop()
|
defer timer.Stop()
|
||||||
secretNames := []string{"testsecret1", "testsecret2"}
|
secretNames := []string{"testsecret1", "testsecret2"}
|
||||||
|
errMsgs := []string{"err1", "err2", "err3"}
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case event, ok := <-wc:
|
case event, ok := <-wc:
|
||||||
@ -96,7 +97,13 @@ func receiveUntil(wc chan watch.Event, d time.Duration) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if event.Type == watch.Error {
|
if event.Type == watch.Error {
|
||||||
return errors.New(fmt.Sprintf("watch chan should not have sent events of type [%s]", watch.Error))
|
status, ok := event.Object.(*metav1.Status)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.HasSuffix(status.Message, errMsgs[0]) {
|
||||||
|
errMsgs = errMsgs[1:]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
secret, ok := event.Object.(*v1.Secret)
|
secret, ok := event.Object.(*v1.Secret)
|
||||||
if !ok {
|
if !ok {
|
||||||
@ -105,7 +112,7 @@ func receiveUntil(wc chan watch.Event, d time.Duration) error {
|
|||||||
if secret.Name == secretNames[0] {
|
if secret.Name == secretNames[0] {
|
||||||
secretNames = secretNames[1:]
|
secretNames = secretNames[1:]
|
||||||
}
|
}
|
||||||
if len(secretNames) == 0 {
|
if len(secretNames) == 0 && len(errMsgs) == 0 {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
|
Loading…
Reference in New Issue
Block a user