github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 04:06:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #53971 from jianglingxia/jlx-install

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 53820, 53971). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

reopen #50354 about install_test.go of error message amending

**What this PR does / why we need it**:
because of unknown repository,I can not update it in before branch,so I reopen the pr #50354 
**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:
cc @irfanurrehman
**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-10-24 09:32:19 -07:00 committed by GitHub
commit 0829376d8b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
federation/apis/federation/install/install_test.go
View File

@ -36,7 +36,7 @@ func TestResourceVersioner(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}
if version != "10" {
t.Errorf("unexpected version %v", version)
t.Errorf("version = %v, want 10", version)
}
clusterList := federation.ClusterList{ListMeta: metav1.ListMeta{ResourceVersion: "10"}}
@ -45,7 +45,7 @@ func TestResourceVersioner(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}
if version != "10" {
t.Errorf("unexpected version %v", version)
t.Errorf("version = %v, want 10", version)
}
}
@ -104,7 +104,7 @@ func TestRESTMapper(t *testing.T) {
interfaces, _ := legacyscheme.Registry.GroupOrDie(federation.GroupName).InterfacesFor(version)
if mapping.ObjectConvertor != interfaces.ObjectConvertor {
t.Errorf("unexpected: %#v, expected: %#v", mapping, interfaces)
t.Errorf("mapping: %#v, interfaces: %#v", mapping, interfaces)
}
rc := &federation.Cluster{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}