fix: fix rebase problem

Author: root

console/atest-ui/package.json

@@ -16,6 +16,7 @@
     "test": "vitest"
   },
   "dependencies": {
+    "@vueuse/core": "^10.11.0",
     "codemirror": "^5.65.17",
     "diff-match-patch": "^1.0.5",
     "element-plus": "^2.3.7",

pkg/runner/monitor/monitor.pb.go

@@ -562,7 +562,6 @@ func (s *server) GetHistoryTestCase(ctx context.Context, in *HistoryTestCase) (r
 	return
 }
 
-<<<<<<< HEAD
 var ExecutionCountNum = promauto.NewCounter(prometheus.CounterOpts{
 	Name: "atest_execution_count",
 	Help: "The total number of request execution",
@@ -607,10 +606,10 @@ func (s *server) RunTestCase(ctx context.Context, in *TestCaseIdentity) (result
 			Parameters: in.Parameters,
 		}
 
-		result = s.getRunResult(ctx, task)  
-		if result.Error != "" {  
-		   return  
-		}  
+		result = s.getRunResult(ctx, task)
+		if result.Error != "" {
+			return
+		}
 		normalResult := ToNormalTestCaseResult(result)
 		var testSuite *testing.TestSuite
 		if testSuite, err = s.getSuiteFromTestTask(task); err != nil {
@@ -623,7 +622,11 @@ func (s *server) RunTestCase(ctx context.Context, in *TestCaseIdentity) (result
 			result = &TestCaseResult{
 				Error: err.Error(),
 			}
-=======
+		}
+	}
+	return
+}
+
 func (s *server) GetTestCaseAllHistory(ctx context.Context, in *TestCase) (result *HistoryTestCases, err error) {
 	var items []testing.HistoryTestCase
 	loader := s.getLoader(ctx)
@@ -632,138 +635,90 @@ func (s *server) GetTestCaseAllHistory(ctx context.Context, in *TestCase) (resul
 		result = &HistoryTestCases{}
 		for _, item := range items {
 			result.Data = append(result.Data, ConvertToGRPCHistoryTestCase(item))
->>>>>>> 6c2cd54 (feat: add history case revert api and ui)
 		}
 	}
 	return
 }
 
-<<<<<<< HEAD
-=======
-func (s *server) RunTestCase(ctx context.Context, in *TestCaseIdentity) (result *TestCaseResult, err error) {  
-    var targetTestSuite testing.TestSuite  
-  
-    loader := s.getLoader(ctx)  
-    defer loader.Close()  
-    targetTestSuite, err = loader.GetTestSuite(in.Suite, true)  
-    if err != nil {  
-       err = nil  
-       result = &TestCaseResult{  
-          Error: fmt.Sprintf("not found suite: %s", in.Suite),  
-       }  
-       return  
-    }  
-  
-    var data []byte  
-    if data, err = yaml.Marshal(targetTestSuite); err == nil {  
-       task := &TestTask{  
-          Kind:       "testcaseInSuite",  
-          Data:       string(data),  
-          CaseName:   in.Testcase,  
-          Level:      "debug",  
-          Parameters: in.Parameters,  
-       }  
-       result = s.getRunResult(ctx, task)  
-       if result.Error != "" {  
-          return  
-       }  
-       normalResult := ToNormalTestCaseResult(result)  
-       var testSuite *testing.TestSuite  
-       if testSuite, err = s.getSuiteFromTestTask(task); err != nil {  
-          result = &TestCaseResult{  
-             Error: err.Error(),  
-          }  
-       }  
-       err = loader.CreateHistoryTestCase(normalResult, testSuite)  
-       if err != nil {  
-          result = &TestCaseResult{  
-             Error: err.Error(),  
-          }  
-       }  
-    }  
-    return  
-}  
-  
->>>>>>> 6c2cd54 (feat: add history case revert api and ui)
-func (s *server) RunHistoryTestCase(ctx context.Context, in *HistoryTestCase) (result *TestCaseResult, err error) {  
-    var targetTestCase testing.HistoryTestCase  
-  
-    loader := s.getLoader(ctx)  
-    defer loader.Close()  
-    targetTestCase, err = loader.GetHistoryTestCase(in.ID)  
-    if err != nil {  
-       err = nil  
-       result = &TestCaseResult{  
-          Error: fmt.Sprintf("not found : %s", in.ID),  
-       }  
-       return  
-    }  
-  
-    var data []byte  
-    if data, err = yaml.Marshal(targetTestCase); err == nil {  
-       task := &TestTask{  
-          Kind:       "historyTestcase",  
-          Data:       string(data),  
-          CaseName:   targetTestCase.CaseName,  
-          Level:      "debug",  
-          Parameters: in.SuiteParam,  
-       }  
-       result = s.getRunResult(ctx, task)  
-       if result.Error != "" {  
-          return  
-       }  
-       normalResult := ToNormalTestCaseResult(result)  
-       var testSuite *testing.TestSuite  
-       if testSuite, err = s.getSuiteFromTestTask(task); err != nil {  
-          result = &TestCaseResult{  
-             Error: err.Error(),  
-          }  
-       }  
-       err = loader.CreateHistoryTestCase(normalResult, testSuite)  
-       if err != nil {  
-          result = &TestCaseResult{  
-             Error: err.Error(),  
-          }  
-       }  
-    }  
-    return  
-}  
-
-func (s *server) getRunResult(ctx context.Context, task *TestTask) (result *TestCaseResult) {  
+func (s *server) RunHistoryTestCase(ctx context.Context, in *HistoryTestCase) (result *TestCaseResult, err error) {
+	var targetTestCase testing.HistoryTestCase
+
+	loader := s.getLoader(ctx)
+	defer loader.Close()
+	targetTestCase, err = loader.GetHistoryTestCase(in.ID)
+	if err != nil {
+		err = nil
+		result = &TestCaseResult{
+			Error: fmt.Sprintf("not found : %s", in.ID),
+		}
+		return
+	}
+
+	var data []byte
+	if data, err = yaml.Marshal(targetTestCase); err == nil {
+		task := &TestTask{
+			Kind:       "historyTestcase",
+			Data:       string(data),
+			CaseName:   targetTestCase.CaseName,
+			Level:      "debug",
+			Parameters: in.SuiteParam,
+		}
+		result = s.getRunResult(ctx, task)
+		if result.Error != "" {
+			return
+		}
+		normalResult := ToNormalTestCaseResult(result)
+		var testSuite *testing.TestSuite
+		if testSuite, err = s.getSuiteFromTestTask(task); err != nil {
+			result = &TestCaseResult{
+				Error: err.Error(),
+			}
+		}
+		err = loader.CreateHistoryTestCase(normalResult, testSuite)
+		if err != nil {
+			result = &TestCaseResult{
+				Error: err.Error(),
+			}
+		}
+	}
+	return
+}
+
+func (s *server) getRunResult(ctx context.Context, task *TestTask) (result *TestCaseResult) {
 	var reply *TestResult
 	var lastItem *TestCaseResult
-    if reply, err := s.Run(ctx, task); err == nil && len(reply.TestCaseResult) > 0 {  
-       lastIndex := len(reply.TestCaseResult) - 1  
-       lastItem := reply.TestCaseResult[lastIndex]  
-  
-       if len(lastItem.Body) > GrpcMaxRecvMsgSize {  
-          e := "the HTTP response body exceeded the maximum message size limit received by the gRPC client"  
-          return &TestCaseResult{  
-             Output:     reply.Message,  
-             Error:      e,  
-             Body:       "",  
-             Header:     lastItem.Header,  
-             StatusCode: http.StatusOK,  
-          }  
-       }  
-  
-       result = &TestCaseResult{  
-          Output:     reply.Message,  
-          Error:      reply.Error,  
-          Body:       lastItem.Body,  
-          Header:     lastItem.Header,  
-          StatusCode: lastItem.StatusCode,  
-       }  
-    } else if err != nil {  
-		result = &TestCaseResult{  
-          Error: err.Error(),  
-       }  
-    } else {  
-		result = &TestCaseResult{  
-          Output: reply.Message,  
-          Error:  reply.Error,  
-       }  
-    }
+	if reply, err := s.Run(ctx, task); err == nil && len(reply.TestCaseResult) > 0 {
+		lastIndex := len(reply.TestCaseResult) - 1
+		lastItem := reply.TestCaseResult[lastIndex]
+
+		if len(lastItem.Body) > GrpcMaxRecvMsgSize {
+			e := "the HTTP response body exceeded the maximum message size limit received by the gRPC client"
+			return &TestCaseResult{
+				Output:     reply.Message,
+				Error:      e,
+				Body:       "",
+				Header:     lastItem.Header,
+				StatusCode: http.StatusOK,
+			}
+		}
+
+		result = &TestCaseResult{
+			Output:     reply.Message,
+			Error:      reply.Error,
+			Body:       lastItem.Body,
+			Header:     lastItem.Header,
+			StatusCode: lastItem.StatusCode,
+		}
+	} else if err != nil {
+		result = &TestCaseResult{
+			Error: err.Error(),
+		}
+	} else {
+		result = &TestCaseResult{
+			Output: reply.Message,
+			Error:  reply.Error,
+		}
+	}
 	if reply != nil {
 		result.Output = reply.Message
 		result.Error = reply.Error
@@ -773,7 +728,7 @@ func (s *server) getRunResult(ctx context.Context, task *TestTask) (result *Test
 		result.Header = lastItem.Header
 		result.StatusCode = lastItem.StatusCode
 	}
-    return  
+	return
 }
 
 func mapInterToPair(data map[string]interface{}) (pairs []*Pair) {