github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15351 from caesarxuchao/fix-14584-1

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-13 02:19:43 -07:00
parent b0d5738936 7817c2312c
commit 2dec0826f7
31 changed files with 4006 additions and 3667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/master/master_test.go
View File

@@ -292,7 +292,7 @@ func TestDefaultAPIGroupVersion(t *testing.T) {
}
// TestExpapi verifies that the unexported exapi creates
// the an experimental api APIGroupVersion.
// the an experimental unversioned.APIGroupVersion.
func TestExpapi(t *testing.T) {
master, config, assert := setUp(t)
@@ -367,20 +367,20 @@ func TestDiscoveryAtAPIS(t *testing.T) {
assert.Equal(http.StatusOK, resp.StatusCode)
groupList := api.APIGroupList{}
groupList := unversioned.APIGroupList{}
assert.NoError(decodeResponse(resp, &groupList))
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
expectGroupName := "extensions"
expectVersions := []api.GroupVersion{
expectVersions := []unversioned.GroupVersion{
{
GroupVersion: testapi.Extensions.GroupAndVersion(),
Version: testapi.Extensions.Version(),
},
}
expectPreferredVersion := api.GroupVersion{
expectPreferredVersion := unversioned.GroupVersion{
GroupVersion: config.StorageVersions["extensions"],
Version: apiutil.GetVersion(config.StorageVersions["extensions"]),
}