github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

client-go: properly return error in fake discovery (#79612)

Browse Source 
Fake discovery should return an error if an error-returning reactor was prepended.

This is relevant e.g. for unit tests which test a function which relies
on discovery to check if an API Server is available.

Matches existing behavior of other fake types, for example fake_namespace.

Adds unit test coverage as well.
This commit is contained in:
Max Horstmann 2022-12-14 11:41:10 -05:00
parent 4b27077eb2
commit b47748103a
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/client-go/discovery/fake/discovery.go
View File

@ -141,7 +141,10 @@ func (c *FakeDiscovery) ServerVersion() (*version.Info, error) {
action := testing.ActionImpl{} action := testing.ActionImpl{}
action.Verb = "get" action.Verb = "get"
action.Resource = schema.GroupVersionResource{Resource: "version"} action.Resource = schema.GroupVersionResource{Resource: "version"}
c.Invokes(action, nil) _, err := c.Invokes(action, nil)
if err != nil {
return nil, err
}
if c.FakedServerVersion != nil { if c.FakedServerVersion != nil {
return c.FakedServerVersion, nil return c.FakedServerVersion, nil

19
staging/src/k8s.io/client-go/discovery/fake/discovery_test.go
View File

@ -17,11 +17,14 @@ limitations under the License.
package fake_test package fake_test
import ( import (
"errors"
"testing" "testing"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/version" "k8s.io/apimachinery/pkg/version"
fakediscovery "k8s.io/client-go/discovery/fake" fakediscovery "k8s.io/client-go/discovery/fake"
fakeclientset "k8s.io/client-go/kubernetes/fake" fakeclientset "k8s.io/client-go/kubernetes/fake"
kubetesting "k8s.io/client-go/testing"
) )
func TestFakingServerVersion(t *testing.T) { func TestFakingServerVersion(t *testing.T) {
@ -44,3 +47,19 @@ func TestFakingServerVersion(t *testing.T) {
t.Fatalf("unexpected faked discovery return value: %q", sv.GitCommit) t.Fatalf("unexpected faked discovery return value: %q", sv.GitCommit)
} }
} }
func TestFakingServerVersionWithError(t *testing.T) {
expectedError := errors.New("an error occurred")
fakeClient := fakeclientset.NewSimpleClientset()
fakeClient.Discovery().(*fakediscovery.FakeDiscovery).PrependReactor("*", "*", func(action kubetesting.Action) (handled bool, ret runtime.Object, err error) {
return true, nil, expectedError
})
_, err := fakeClient.Discovery().ServerVersion()
if err == nil {
t.Fatal("ServerVersion should return error, returned nil instead")
}
if err != expectedError {
t.Fatal("ServerVersion should return expected error, returned different error instead")
}
}