Merge pull request #53971 from jianglingxia/jlx-install

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 ```

Merge pull request #53971 from jianglingxia/jlx-install
0829376d · Kubernetes Submit Queue · GitHub · df9e32b2 · 3e65a2f7 · 0829376d
Commit 0829376d authored Oct 24, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

install_test.go federation/apis/federation/install/install_test.go +3 -3

No files found.
--- a/federation/apis/federation/install/install_test.go
+++ b/federation/apis/federation/install/install_test.go
@@ -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"}}