Revert PodLogs method and fixed TestNamespaceHealthInvalidRate

kiali · Mar 28, 2024 · 02c44a7 · 02c44a7
1 parent dc4e618
commit 02c44a7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/tests/integration/tests/namespaces_test.go b/tests/integration/tests/namespaces_test.go
@@ -72,7 +72,7 @@ func TestNamespaceHealthInvalidRate(t *testing.T) {
 
 	// 500 and error message which is not failing in unmarshalling
 	require.Error(err)
-	require.Contains(err.Error(), "not a valid duration string: \"invalid\"")
+	require.Contains(err.Error(), "not a valid duration string: \\\"invalid\\\"")
 	require.NotEqual(200, code)
 }
 

diff --git a/tests/integration/tests/pod_logs_test.go b/tests/integration/tests/pod_logs_test.go
@@ -58,7 +58,7 @@ func TestLogsInvalidLineCount(t *testing.T) {
 }
 
 func assertEmptyLogs(logs *business.PodLog, err error, require *require.Assertions) {
-	require.Error(err)
+	require.NoError(err)
 	require.NotNil(logs)
 	require.Empty(logs.Entries)
 }

diff --git a/tests/integration/utils/kiali/kiali_client.go b/tests/integration/utils/kiali/kiali_client.go
@@ -613,11 +613,15 @@ func FirstPodName(name, namespace string) (string, error) {
 
 func PodLogs(name, namespace string, params map[string]string) (*business.PodLog, error) {
 	url := fmt.Sprintf("%s/api/namespaces/%s/pods/%s/logs?sinceTime=%d&%s", client.kialiURL, namespace, name, TimeSinceSeconds(), ParamsAsString(params))
-	logs := new(business.PodLog)
-
-	_, err := getRequestAndUnmarshalInto(url, logs)
+	body, _, _, err := httpGETWithRetry(url, client.GetAuth(), TIMEOUT, nil, client.kialiCookies)
 	if err == nil {
-		return logs, nil
+		logs := new(business.PodLog)
+		err = json.Unmarshal(body, &logs)
+		if err == nil {
+			return logs, nil
+		} else {
+			return nil, err
+		}
 	} else {
 		return nil, err
 	}