Increased the Task timeout; better logging of attached files. (#263) (#264)

* Increased the Task timeout; better logging of attached files.



* checkpoint



---------

Signed-off-by: Jeff Ortel <[email protected]>
Signed-off-by: Cherry Picker <[email protected]>
Co-authored-by: Jeff Ortel <[email protected]>

Author: konveyor-ci-bot[bot]

analysis/analysis_test.go

@@ -147,7 +147,7 @@ func TestApplicationAnalysis(t *testing.T) {
 				if err != nil {
 					t.Error(err)
 				}
-				printAllAtachmentsOnTask(task, dir)
+				printTaskAttachments(task, dir)
 				//if this is still running after timeout, then we should move on, this wont work
 				return
 
@@ -160,7 +160,7 @@ func TestApplicationAnalysis(t *testing.T) {
 				if err != nil {
 					t.Error(err)
 				}
-				printAllAtachmentsOnTask(task, dir)
+				printTaskAttachments(task, dir)
 				// If the task was unsuccessful there is no reason to continue execution.
 				return
 			}
@@ -236,8 +236,8 @@ func TestApplicationAnalysis(t *testing.T) {
 
 					} else {
 						// Ensure stable order of Incidents.
-						sort.SliceStable(got.Incidents, func(a, b int) bool { return got.Incidents[a].File + fmt.Sprint(got.Incidents[a].Line) < got.Incidents[b].File + fmt.Sprint(got.Incidents[b].Line) })
-						sort.SliceStable(expected.Incidents, func(a, b int) bool { return expected.Incidents[a].File + fmt.Sprint(expected.Incidents[a].Line) < expected.Incidents[b].File + fmt.Sprint(expected.Incidents[b].Line)})
+						sort.SliceStable(got.Incidents, func(a, b int) bool { return got.Incidents[a].File+fmt.Sprint(got.Incidents[a].Line) < got.Incidents[b].File+fmt.Sprint(got.Incidents[b].Line) })
+						sort.SliceStable(expected.Incidents, func(a, b int) bool { return expected.Incidents[a].File+fmt.Sprint(expected.Incidents[a].Line) < expected.Incidents[b].File+fmt.Sprint(expected.Incidents[b].Line) })
 						for j, gotInc := range got.Incidents {
 							expectedInc := expected.Incidents[j]
 							if gotInc.File != expectedInc.File {
@@ -370,17 +370,19 @@ func getDefaultToken() string {
 	return string(decrypted)
 }
 
-func printAllAtachmentsOnTask(task *api.Task, dir string) error {
-	for _, attachement := range task.Attached {
-		err := RichClient.File.Get(attachement.ID, dir)
+func printTaskAttachments(task *api.Task, dir string) error {
+	for _, attachment := range task.Attached {
+		err := RichClient.File.Get(attachment.ID, dir)
 		if err != nil {
 			return err
 		}
-		b, err := os.ReadFile(filepath.Join(dir, attachement.Name))
+		b, err := os.ReadFile(filepath.Join(dir, attachment.Name))
 		if err != nil {
 			return err
 		}
-		pp.Println(string(b))
+		fmt.Printf("\nAttachment: %s\n", attachment.Name)
+		fmt.Println(string(b))
+		fmt.Println("")
 	}
 
 	return nil

analysis/pkg.go

@@ -21,8 +21,8 @@ var (
 	Client     *binding.Client
 	RichClient *binding.RichClient
 
-	// Analysis waiting loop 5 minutes (60 * 5s)
-	Retry = 200
+	// Analysis waiting loop 20 minutes.
+	Retry = 240
 	Wait  = 5 * time.Second
 )