support to the interval on batch mode

Author: LinuxSuRen

console/atest-ui/src/views/TestCase.vue

@@ -60,6 +60,10 @@ const sendRequest = async () => {
 }
 Magic.Keys(sendRequest, ['Alt+S', 'Alt+ß'])
 
+const runTestCaseResultHandler = (e: any) => {
+  requestLoading.value = false
+  handleTestResult(e)
+}
 const runTestCase = () => {
   requestLoading.value = true
   const name = props.name
@@ -73,20 +77,17 @@ const runTestCase = () => {
   if (batchRunMode.value) {
     API.BatchRunTestCase({
       count: batchRunCount.value,
+      interval: batchRunInterval.value,
       request: request
-    }, (d) => {
+    }, runTestCaseResultHandler, (e) => {
+      parameters.value = []
+
       requestLoading.value = false
-      ElMessage({
-        showClose: true,
-        message: d,
-        type: 'success'
-      })
+      UIAPI.ErrorTip(e)
+      parseResponseBody(e.body)
     })
   } else {
-    API.RunTestCase(request, (e) => {
-      handleTestResult(e)
-      requestLoading.value = false
-    }, (e) => {
+    API.RunTestCase(request, runTestCaseResultHandler, (e) => {
       parameters.value = []
 
       requestLoading.value = false
@@ -168,6 +169,7 @@ function responseBodyFilter() {
 const parameterDialogOpened = ref(false)
 const batchRunMode = ref(false)
 const batchRunCount = ref(1)
+const batchRunInterval = ref('1s')
 const openBatchRunDialog = () => {
   batchRunMode.value = true
   openParameterDialog()
@@ -1269,7 +1271,15 @@ Magic.Keys(() => {
                 Count:
               </el-col>
               <el-col :span="18">
-                <el-input v-model="batchRunCount" type="number" />
+                <el-input v-model="batchRunCount" type="number" min="1" max="100"/>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                Interval:
+              </el-col>
+              <el-col :span="18">
+                <el-input v-model="batchRunInterval" />
               </el-col>
             </el-row>
           </div>

console/atest-ui/src/views/net.ts

@@ -284,6 +284,7 @@ interface RunTestCaseRequest {
 
 interface BatchRunTestCaseRequest {
   count: number
+  interval: string
   request: RunTestCaseRequest
 }
 
@@ -306,7 +307,8 @@ function RunTestCase(request: RunTestCaseRequest,
   .then(callback).catch(emptyOrDefault(errHandle))
 }
 
-const BatchRunTestCase = (request: BatchRunTestCaseRequest, callback: (d: any) => void) => {
+const BatchRunTestCase = (request: BatchRunTestCaseRequest,
+  callback: (d: any) => void,  errHandle?: (e: any) => void | null) => {
   const requestOptions = {
     method: 'POST',
     headers: {
@@ -319,26 +321,29 @@ const BatchRunTestCase = (request: BatchRunTestCaseRequest, callback: (d: any) =
       caseName: request.request.name,
       parameters: request.request.parameters,
       count: request.count,
+      interval: request.interval,
     })
   }
   fetch(`/api/v1/batchRun`, requestOptions)
     .then((response: any) => {
       if (response.ok) {
-        const reader = response.body.getReader();
-        let { done, value } = reader.read();
-        while (!done) {
-          const chunk = new TextDecoder().decode(value, { stream: true });
-
-          console.log(chunk);
-          // callback(chunk);
-
-          ({ done, value } = reader.read());
+        const read = (reader: any) => {
+          reader.read().then((data: any) => {
+            if (data.done) {
+              return;
+            }
+  
+            const value = data.value;
+            const chunk = new TextDecoder().decode(value, { stream: true });
+            callback(JSON.parse(chunk).result.testCaseResult[0]);
+            read(reader);
+          });
         }
-        callback('');
+        read(response.body.getReader());
       } else {
-        throw new Error('Network response was not ok.');
+        return DefaultResponseProcess(response)
       }
-    })
+    }).catch(emptyOrDefault(errHandle))
 }
 
 function DuplicateTestCase(sourceSuiteName: string, targetSuiteName: string,

pkg/server/remote_server.go

@@ -311,6 +311,11 @@ func (s *server) BatchRun(srv Runner_BatchRunServer) (err error) {
 				return err
 			}
 
+			var duration time.Duration
+			if duration, err = time.ParseDuration(in.Interval); err != nil {
+				return
+			}
+
 			for i := 0; i < int(in.Count); i++ {
 				var reply *TestCaseResult
 				if reply, err = s.RunTestCase(ctx, &TestCaseIdentity{
@@ -326,7 +331,8 @@ func (s *server) BatchRun(srv Runner_BatchRunServer) (err error) {
 				}); err != nil {
 					return err
 				}
-				time.Sleep(time.Second * 2)
+
+				time.Sleep(duration)
 			}
 		}
 	}