e2e tests fixed, coverage job fix test

Signed-off-by: Dhruv-J <dhruvj@vmware.com>
antrea-io · Jul 17, 2023 · f17b44e · f17b44e
1 parent 3787f3e
commit f17b44e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/kind.yml b/.github/workflows/kind.yml
@@ -161,7 +161,7 @@ jobs:
       - name: collect coverage files from node
         run: |
           touch .coverage/kind-e2e-coverage.txt
-          go tool covdata merge -i=./.coverage/clickhouse-monitor-coverage,.coverage/theia-manager.coverage -o .coverage/merged
+          go tool covdata merge -i=./.coverage/clickhouse-monitor-coverage,.coverage/theia-manager-coverage -o .coverage/merged
           go tool covdata textfmt -i=./.coverage/merged -o .coverage/kind-e2e-coverage.txt
       - name: Codecov
         uses: codecov/codecov-action@v3

diff --git a/test/e2e/framework.go b/test/e2e/framework.go
@@ -1648,8 +1648,8 @@ func (data *TestData) killProcessesAndCollectCovFiles(namespace, podName, contai
 	log.Infof("first find command run")
 	var files []string
 	if err != nil || rc != 0 {
-		log.Infof("error for first find command is not nil: "+err.Error())
-		if !strings.Contains(err.Error(), "No such file or directory") {
+		log.Infof("error for first find command is not nil")
+		if err != nil && !strings.Contains(err.Error(), "No such file or directory") {
 			log.Infof("reached into if condition")
 			return fmt.Errorf("error when running this find command (for coverage file) '%s' on Node kind-worker, stderr: <%v>, err: <%v>", cmd, stderr, err)
 		}
@@ -1662,8 +1662,8 @@ func (data *TestData) killProcessesAndCollectCovFiles(namespace, podName, contai
 	rc, stdout, stderr, err = data.RunCommandOnNode("kind-worker", cmd)
 	log.Infof("second find command run")
 	if err != nil || rc != 0 {
-		log.Infof("error for second find command is not nil: "+err.Error())
-		if !strings.Contains(err.Error(), "No such file or directory") {
+		log.Infof("error for second find command is not nil")
+		if err != nil && !strings.Contains(err.Error(), "No such file or directory") {
 			log.Infof("reached into if condition")
 			return fmt.Errorf("error when running this find command (for coverage file) '%s' on Node kind-worker, stderr: <%v>, err: <%v>", cmd, stderr, err)
 		}
@@ -1688,8 +1688,8 @@ func (data *TestData) killProcessesAndCollectCovFiles(namespace, podName, contai
 	rc, stdout, stderr, err = data.RunCommandOnNode("kind-worker2", cmd)
 	log.Infof("third find command run")
 	if err != nil || rc != 0 {
-		log.Infof("error for third find command is not nil: "+err.Error())
-		if !strings.Contains(err.Error(), "No such file or directory") {
+		log.Infof("error for third find command is not nil")
+		if err != nil && !strings.Contains(err.Error(), "No such file or directory") {
 			log.Infof("reached into if condition")
 			return fmt.Errorf("error when running this find command (for coverage file) '%s' on Node kind-worker2, stderr: <%v>, err: <%v>", cmd, stderr, err)
 		}
@@ -1702,8 +1702,8 @@ func (data *TestData) killProcessesAndCollectCovFiles(namespace, podName, contai
 	rc, stdout, stderr, err = data.RunCommandOnNode("kind-worker2", cmd)
 	log.Infof("fourth find command run")
 	if err != nil || rc != 0 {
-		log.Infof("error for fourth find command is not nil: "+err.Error())
-		if !strings.Contains(err.Error(), "No such file or directory") {
+		log.Infof("error for fourth find command is not nil")
+		if err != nil && !strings.Contains(err.Error(), "No such file or directory") {
 			log.Infof("reached into if condition")
 			return fmt.Errorf("error when running this find command (for coverage file) '%s' on Node kind-worker2, stderr: <%v>, err: <%v>", cmd, stderr, err)
 		}