Fix rebase fail

Signed-off-by: Benoit Tigeot <benoit.tigeot@lifen.fr>
pull/30698/head
Benoit Tigeot 6 months ago
parent 28305b5f3c
commit 0ccae497aa
No known key found for this signature in database
GPG Key ID: 8E6D4FC8AEBDA62C

@ -807,7 +807,7 @@ func Test_ReadyChecker_replicaSetReady(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
c := NewReadyChecker(fake.NewSimpleClientset()) c := NewReadyChecker(fake.NewClientset())
if got := c.replicaSetReady(tt.args.rs); got != tt.want { if got := c.replicaSetReady(tt.args.rs); got != tt.want {
t.Errorf("replicaSetReady() = %v, want %v", got, tt.want) t.Errorf("replicaSetReady() = %v, want %v", got, tt.want)
} }
@ -841,7 +841,7 @@ func Test_ReadyChecker_replicationControllerReady(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
c := NewReadyChecker(fake.NewSimpleClientset()) c := NewReadyChecker(fake.NewClientset())
if got := c.replicationControllerReady(tt.args.rc); got != tt.want { if got := c.replicationControllerReady(tt.args.rc); got != tt.want {
t.Errorf("replicationControllerReady() = %v, want %v", got, tt.want) t.Errorf("replicationControllerReady() = %v, want %v", got, tt.want)
} }
@ -896,7 +896,7 @@ func Test_ReadyChecker_daemonSetReady(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
c := NewReadyChecker(fake.NewSimpleClientset()) c := NewReadyChecker(fake.NewClientset())
if got := c.daemonSetReady(tt.args.ds); got != tt.want { if got := c.daemonSetReady(tt.args.ds); got != tt.want {
t.Errorf("daemonSetReady() = %v, want %v", got, tt.want) t.Errorf("daemonSetReady() = %v, want %v", got, tt.want)
} }
@ -972,7 +972,7 @@ func Test_ReadyChecker_statefulSetReady(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
c := NewReadyChecker(fake.NewSimpleClientset()) c := NewReadyChecker(fake.NewClientset())
if got := c.statefulSetReady(tt.args.sts); got != tt.want { if got := c.statefulSetReady(tt.args.sts); got != tt.want {
t.Errorf("statefulSetReady() = %v, want %v", got, tt.want) t.Errorf("statefulSetReady() = %v, want %v", got, tt.want)
} }
@ -1031,7 +1031,7 @@ func Test_ReadyChecker_podsReadyForObject(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
c := NewReadyChecker(fake.NewSimpleClientset()) c := NewReadyChecker(fake.NewClientset())
for _, pod := range tt.existPods { for _, pod := range tt.existPods {
if _, err := c.client.CoreV1().Pods(defaultNamespace).Create(context.TODO(), &pod, metav1.CreateOptions{}); err != nil { if _, err := c.client.CoreV1().Pods(defaultNamespace).Create(context.TODO(), &pod, metav1.CreateOptions{}); err != nil {
t.Errorf("Failed to create Pod error: %v", err) t.Errorf("Failed to create Pod error: %v", err)
@ -1110,7 +1110,7 @@ func Test_ReadyChecker_jobReady(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
c := NewReadyChecker(fake.NewSimpleClientset()) c := NewReadyChecker(fake.NewClientset())
got, err := c.jobReady(tt.args.job) got, err := c.jobReady(tt.args.job)
if (err != nil) != tt.wantErr { if (err != nil) != tt.wantErr {
t.Errorf("jobReady() error = %v, wantErr %v", err, tt.wantErr) t.Errorf("jobReady() error = %v, wantErr %v", err, tt.wantErr)
@ -1149,7 +1149,7 @@ func Test_ReadyChecker_volumeReady(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
c := NewReadyChecker(fake.NewSimpleClientset()) c := NewReadyChecker(fake.NewClientset())
if got := c.volumeReady(tt.args.v); got != tt.want { if got := c.volumeReady(tt.args.v); got != tt.want {
t.Errorf("volumeReady() = %v, want %v", got, tt.want) t.Errorf("volumeReady() = %v, want %v", got, tt.want)
} }
@ -1194,7 +1194,7 @@ func Test_ReadyChecker_serviceReady(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
c := NewReadyChecker(fake.NewSimpleClientset()) c := NewReadyChecker(fake.NewClientset())
got := c.serviceReady(tt.args.service) got := c.serviceReady(tt.args.service)
if got != tt.want { if got != tt.want {
t.Errorf("serviceReady() = %v, want %v", got, tt.want) t.Errorf("serviceReady() = %v, want %v", got, tt.want)
@ -1263,7 +1263,7 @@ func Test_ReadyChecker_crdBetaReady(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
c := NewReadyChecker(fake.NewSimpleClientset()) c := NewReadyChecker(fake.NewClientset())
got := c.crdBetaReady(tt.args.crdBeta) got := c.crdBetaReady(tt.args.crdBeta)
if got != tt.want { if got != tt.want {
t.Errorf("crdBetaReady() = %v, want %v", got, tt.want) t.Errorf("crdBetaReady() = %v, want %v", got, tt.want)

Loading…
Cancel
Save