test: compatible with 2.11 (streamnative#901)

nodece · web-flow · commit bfca5de17028 · 2022-12-07T10:29:00.000+08:00
Signed-off-by: Zixuan Liu &lt;nodeces@gmail.com&gt;
diff --git a/pkg/ctl/functions/test_help.go b/pkg/ctl/functions/test_help.go
@@ -69,6 +69,7 @@ func ResourceDir() string {
 }
 
 func FailImmediatelyIfErrorNotNil(t *testing.T, err ...error) {
+	t.Helper()
 	for _, e := range err {
 		if e != nil {
 			t.Logf(e.Error())
diff --git a/pkg/ctl/namespace/message_ttl_test.go b/pkg/ctl/namespace/message_ttl_test.go
@@ -43,5 +43,5 @@ func TestMessageTTL(t *testing.T) {
 	setTTLArgs = []string{"set-message-ttl", "public/test-ttl-namespace", "-t", "-2"}
 	_, execErr, _, _ = TestNamespaceCommands(setMessageTTL, setTTLArgs)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, execErr.Error(), "code: 412 reason: Invalid value for message TTL")
+	assert.Contains(t, execErr.Error(), "code: 412 reason: Invalid value for message TTL")
 }
diff --git a/pkg/ctl/nsisolationpolicy/broker_test.go b/pkg/ctl/nsisolationpolicy/broker_test.go
@@ -30,8 +30,7 @@ func TestBrokerAndBrokers(t *testing.T) {
 	brokersFailArgs := []string{"brokers", "standalone"}
 	_, execErr, _, _ := TestNsIsolationPolicyCommands(getAllBrokersWithPolicies, brokersFailArgs)
 	assert.NotNil(t, execErr)
-	exceptedErr := "code: 404 reason: namespace-isolation policies not found for standalone"
-	assert.Equal(t, exceptedErr, execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason")
 
 	setPolicyArgs := []string{"set", "standalone", "test-policy-1",
 		"--auto-failover-policy-params", "min_limit=3,usage_threshold=100",
diff --git a/pkg/ctl/subscription/delete_test.go b/pkg/ctl/subscription/delete_test.go
@@ -77,7 +77,7 @@ func TestDeleteNonExistingSub(t *testing.T) {
 	args = []string{"delete", "test-delete-non-existing-sub-topic", "test-delete-non-existing-sub-non-existing"}
 	_, execErr, _, _ = TestSubCommands(DeleteCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Subscription not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Subscription")
 
 	args = []string{"list", "test-delete-non-existing-sub-topic"}
 	out, execErr, _, _ = TestSubCommands(ListCmd, args)
@@ -89,5 +89,5 @@ func TestDeleteNonExistingTopicSub(t *testing.T) {
 	args := []string{"delete", "non-existing-topic", "non-existing-topic-sub"}
 	_, execErr, _, _ := TestSubCommands(DeleteCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
diff --git a/pkg/ctl/subscription/expire_test.go b/pkg/ctl/subscription/expire_test.go
@@ -56,12 +56,12 @@ func TestExpireNonExistingTopic(t *testing.T) {
 		"test-expire-messages-non-existing-topic-sub"}
 	_, execErr, _, _ := TestSubCommands(ExpireCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 
 	args = []string{"expire", "--expire-time", "1", "--all", "non-existing-topic"}
 	_, execErr, _, _ = TestSubCommands(ExpireCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
 
 func TestExpireNonExistingSub(t *testing.T) {
@@ -74,5 +74,5 @@ func TestExpireNonExistingSub(t *testing.T) {
 		"test-expire-messages-non-existing-sub-non-existing"}
 	_, execErr, _, _ = TestSubCommands(ExpireCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Subscription not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Subscription")
 }
diff --git a/pkg/ctl/subscription/list_test.go b/pkg/ctl/subscription/list_test.go
@@ -35,5 +35,5 @@ func TestListNonExistingTopicSub(t *testing.T) {
 	args := []string{"list", "non-existing-topic"}
 	_, execErr, _, _ := TestSubCommands(ListCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
diff --git a/pkg/ctl/subscription/skip_test.go b/pkg/ctl/subscription/skip_test.go
@@ -59,13 +59,13 @@ func TestSkipNonExistingTopic(t *testing.T) {
 		"test-skip-messages-non-existing-topic-sub"}
 	_, execErr, _, _ := TestSubCommands(SkipCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 
 	args = []string{"skip", "--all", "test-skip-messages-non-existing-topic",
 		"test-skip-messages-non-existing-topic-sub"}
 	_, execErr, _, _ = TestSubCommands(SkipCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
 
 func TestSkipNonExistingSub(t *testing.T) {
@@ -78,12 +78,12 @@ func TestSkipNonExistingSub(t *testing.T) {
 		"test-skip-messages-non-existing-sub-non-existing"}
 	_, execErr, _, _ = TestSubCommands(SkipCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Subscription not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Subscription")
 
 	args = []string{"skip", "--all", "test-skip-messages-non-existing-sub-topic",
 		"test-skip-messages-non-existing-sub-non-existing"}
 	_, execErr, _, _ = TestSubCommands(SkipCmd, args)
-	assert.Equal(t, "code: 404 reason: Subscription not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Subscription")
 }
 
 func TestSkipNoExistingSubCharactersEscaped(t *testing.T) {
@@ -92,5 +92,5 @@ func TestSkipNoExistingSubCharactersEscaped(t *testing.T) {
 	args := []string{"skip", "--all", "test-skip-messages-non-existing-sub-topic",
 		"test-skip-messages-non-existing-sub-non-existing/with/special chars"}
 	_, execErr, _, _ := TestSubCommands(SkipCmd, args)
-	assert.Equal(t, "code: 404 reason: Subscription not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Subscription")
 }
diff --git a/pkg/ctl/topic/compact_status_test.go b/pkg/ctl/topic/compact_status_test.go
@@ -34,7 +34,7 @@ func TestCompactStatusNonExistingTopicError(t *testing.T) {
 	args := []string{"compact-status", "test-non-existing-compact-status"}
 	_, execErr, _, _ := TestTopicCommands(StatusCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
 
 func TestCompactStatusNonPersistentTopicError(t *testing.T) {
diff --git a/pkg/ctl/topic/compact_test.go b/pkg/ctl/topic/compact_test.go
@@ -57,7 +57,7 @@ func TestCompactNonExistingTopic(t *testing.T) {
 	args := []string{"compact", "test-compact-non-existing-topic"}
 	_, execErr, _, _ := TestTopicCommands(CompactCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
 
 func TestCompactNonPersistentTopic(t *testing.T) {
diff --git a/pkg/ctl/topic/delete_test.go b/pkg/ctl/topic/delete_test.go
@@ -75,12 +75,12 @@ func TestDeleteNonExistPartitionedTopic(t *testing.T) {
 	args := []string{"delete", "non-existent-partitioned-topic"}
 	_, execErr, _, _ := TestTopicCommands(DeleteTopicCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Partitioned topic does not exist", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Partitioned")
 }
 
 func TestDeleteNonExistNonPartitionedTopic(t *testing.T) {
 	args := []string{"delete", "--non-partitioned", "non-existent-non-partitioned-topic"}
 	_, execErr, _, _ := TestTopicCommands(DeleteTopicCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
diff --git a/pkg/ctl/topic/last_messageId_test.go b/pkg/ctl/topic/last_messageId_test.go
@@ -34,7 +34,7 @@ func TestGetLastMessageIdTopicNotExistError(t *testing.T) {
 	args := []string{"last-message-id", "not-existent-topic"}
 	_, execErr, _, _ := TestTopicCommands(GetLastMessageIDCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
 
 func TestGetLastMessageIdNotAllowedError(t *testing.T) {
diff --git a/pkg/ctl/topic/offload_status_test.go b/pkg/ctl/topic/offload_status_test.go
@@ -53,5 +53,5 @@ func TestOffloadStatusNonExistingTopicError(t *testing.T) {
 	args := []string{"offload-status", "non-existing-topic"}
 	_, execErr, _, _ := TestTopicCommands(OffloadStatusCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
diff --git a/pkg/ctl/topic/offload_test.go b/pkg/ctl/topic/offload_test.go
@@ -46,5 +46,5 @@ func TestOffloadNonExistingTopicError(t *testing.T) {
 	args := []string{"offload", "test-offload-non-existing-topic", "10m"}
 	_, execErr, _, _ := TestTopicCommands(OffloadCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
diff --git a/pkg/ctl/topic/stats_internal_test.go b/pkg/ctl/topic/stats_internal_test.go
@@ -83,7 +83,7 @@ func TestGetPartitionedTopicInternalStatsError(t *testing.T) {
 	args = []string{"internal-stats", "test-partitioned-topic-internal-stats-error"}
 	_, execErr, _, _ = TestTopicCommands(GetInternalStatsCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
 
 func TestGetInternalStatsArgsError(t *testing.T) {
@@ -97,5 +97,5 @@ func TestGetNonExistingTopic(t *testing.T) {
 	args := []string{"internal-stats", "non-existing-topic"}
 	_, execErr, _, _ := TestTopicCommands(GetInternalStatsCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
diff --git a/pkg/ctl/topic/stats_test.go b/pkg/ctl/topic/stats_test.go
@@ -64,7 +64,7 @@ func TestGetPartitionedStats(t *testing.T) {
 	args = []string{"stats", "test-partitioned-topic-stats"}
 	_, execErr, _, _ = TestTopicCommands(GetStatsCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
 
 func TestGetStatsArgsError(t *testing.T) {
@@ -78,7 +78,7 @@ func TestGetNonExistingTopicStats(t *testing.T) {
 	args := []string{"stats", "non-existing-topic"}
 	_, execErr, _, _ := TestTopicCommands(GetStatsCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
 
 func TestGetPartitionedStatsCmd(t *testing.T) {
@@ -167,7 +167,7 @@ func TestGetNonExistingTopicStatsError(t *testing.T) {
 	args := []string{"stats", "--partitioned-topic", "non-existing-topic"}
 	_, execErr, _, _ := TestTopicCommands(GetStatsCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Partitioned Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Partitioned Topic")
 }
 
 func TestGetNonPartitionedTopicStatsError(t *testing.T) {
@@ -178,5 +178,5 @@ func TestGetNonPartitionedTopicStatsError(t *testing.T) {
 	args = []string{"stats", "--partitioned-topic", "test-non-partitioned-topic-partitioned-stats"}
 	_, execErr, _, _ = TestTopicCommands(GetStatsCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Partitioned Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Partitioned Topic")
 }
diff --git a/pkg/ctl/topic/teminate_test.go b/pkg/ctl/topic/teminate_test.go
@@ -58,5 +58,5 @@ func TestTerminateNonExistingTopic(t *testing.T) {
 	args := []string{"terminate", "non-existing-topic"}
 	_, execErr, _, _ := TestTopicCommands(TerminateCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }
diff --git a/pkg/ctl/topic/unload_test.go b/pkg/ctl/topic/unload_test.go
@@ -45,5 +45,5 @@ func TestUnloadNonExistingTopic(t *testing.T) {
 	args := []string{"unload", "test-unload-non-existing-topic"}
 	_, execErr, _, _ := TestTopicCommands(UnloadCmd, args)
 	assert.NotNil(t, execErr)
-	assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())
+	assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")
 }

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ func ResourceDir() string {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`func FailImmediatelyIfErrorNotNil(t *testing.T, err ...error) {`
	`72`	`+ t.Helper()`
`72`	`73`	`for _, e := range err {`
`73`	`74`	`if e != nil {`
`74`	`75`	`t.Logf(e.Error())`
Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,5 @@ func TestMessageTTL(t *testing.T) {`
`43`	`43`	`setTTLArgs = []string{"set-message-ttl", "public/test-ttl-namespace", "-t", "-2"}`
`44`	`44`	`_, execErr, _, _ = TestNamespaceCommands(setMessageTTL, setTTLArgs)`
`45`	`45`	`assert.NotNil(t, execErr)`
`46`		`- assert.Equal(t, execErr.Error(), "code: 412 reason: Invalid value for message TTL")`
	`46`	`+ assert.Contains(t, execErr.Error(), "code: 412 reason: Invalid value for message TTL")`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,5 @@ func TestListNonExistingTopicSub(t *testing.T) {`
`35`	`35`	`args := []string{"list", "non-existing-topic"}`
`36`	`36`	`_, execErr, _, _ := TestSubCommands(ListCmd, args)`
`37`	`37`	`assert.NotNil(t, execErr)`
`38`		`- assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())`
	`38`	`+ assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func TestCompactStatusNonExistingTopicError(t *testing.T) {`
`34`	`34`	`args := []string{"compact-status", "test-non-existing-compact-status"}`
`35`	`35`	`_, execErr, _, _ := TestTopicCommands(StatusCmd, args)`
`36`	`36`	`assert.NotNil(t, execErr)`
`37`		`- assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())`
	`37`	`+ assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`func TestCompactStatusNonPersistentTopicError(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func TestCompactNonExistingTopic(t *testing.T) {`
`57`	`57`	`args := []string{"compact", "test-compact-non-existing-topic"}`
`58`	`58`	`_, execErr, _, _ := TestTopicCommands(CompactCmd, args)`
`59`	`59`	`assert.NotNil(t, execErr)`
`60`		`- assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())`
	`60`	`+ assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`func TestCompactNonPersistentTopic(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,12 @@ func TestDeleteNonExistPartitionedTopic(t *testing.T) {`
`75`	`75`	`args := []string{"delete", "non-existent-partitioned-topic"}`
`76`	`76`	`_, execErr, _, _ := TestTopicCommands(DeleteTopicCmd, args)`
`77`	`77`	`assert.NotNil(t, execErr)`
`78`		`- assert.Equal(t, "code: 404 reason: Partitioned topic does not exist", execErr.Error())`
	`78`	`+ assert.Contains(t, execErr.Error(), "code: 404 reason: Partitioned")`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`func TestDeleteNonExistNonPartitionedTopic(t *testing.T) {`
`82`	`82`	`args := []string{"delete", "--non-partitioned", "non-existent-non-partitioned-topic"}`
`83`	`83`	`_, execErr, _, _ := TestTopicCommands(DeleteTopicCmd, args)`
`84`	`84`	`assert.NotNil(t, execErr)`
`85`		`- assert.Equal(t, "code: 404 reason: Topic not found", execErr.Error())`
	`85`	`+ assert.Contains(t, execErr.Error(), "code: 404 reason: Topic")`
`86`	`86`	`}`