Skip to content

Commit 72c53c2

Browse files
LinuxSuRenLinuxSuRen
authored
feat: support to run test case in batch mode (#548)
* feat: support to run test case in batch mode * support to the interval on batch mode * support to use a template as interval --------- Co-authored-by: rick <linuxsuren@users.noreply.github.com>
1 parent dcdac9e commit 72c53c2

15 files changed

Lines changed: 1512 additions & 932 deletions

File tree

‎console/atest-ui/src/views/StoreManager.vue‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
22
import { ElMessage } from 'element-plus'
33
import { reactive, ref, watch } from 'vue'
4-
import { Edit, Delete, QuestionFilled } from '@element-plus/icons-vue'
4+
import { Edit, Delete, QuestionFilled, Help } from '@element-plus/icons-vue'
55
import type { FormInstance, FormRules } from 'element-plus'
66
import type { Pair } from './types'
77
import { API } from './net'
@@ -111,8 +111,7 @@ Magic.Keys(addStore, ['Alt+KeyN'])
111111
112112
const rules = reactive<FormRules<Store>>({
113113
name: [{ required: true, message: 'Name is required', trigger: 'blur' }],
114-
url: [{ required: true, message: 'URL is required', trigger: 'blur' }],
115-
pluginName: [{ required: true, message: 'Plugin is required', trigger: 'blur' }]
114+
url: [{ required: true, message: 'URL is required', trigger: 'blur' }]
116115
})
117116
const submitForm = async (formEl: FormInstance | undefined) => {
118117
if (!formEl) return
@@ -130,6 +129,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
130129
watch(() => storeForm.kind.name, (name) => {
131130
const ext = SupportedExtension(name)
132131
if (ext) {
132+
storeExtLink.value = ext.link
133133
let pro = storeForm.properties.slice()
134134
135135
for (var i = 0; i < pro.length;) {
@@ -198,6 +198,8 @@ function updateKeys() {
198198
} as Pair)
199199
}
200200
}
201+
202+
const storeExtLink = ref('')
201203
</script>
202204

203205
<template>
@@ -294,6 +296,11 @@ function updateKeys() {
294296
:value="item.name"
295297
/>
296298
</el-select>
299+
<el-icon v-if="storeExtLink && storeExtLink !== ''">
300+
<el-link :href="storeExtLink" target="_blank">
301+
<Help />
302+
</el-link>
303+
</el-icon>
297304
</el-form-item>
298305
<el-form-item :label="t('field.pluginURL')" prop="plugin">
299306
<el-input v-model="storeForm.kind.url" test-id="store-form-plugin" />

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

Lines changed: 57 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import type { Pair, TestResult, TestCaseWithSuite, TestCase } from './types'
77
import { NewSuggestedAPIsQuery, CreateFilter, GetHTTPMethods, FlattenObject } from './types'
88
import { Cache } from './cache'
99
import { API } from './net'
10+
import type { RunTestCaseRequest } from './net'
1011
import { UIAPI } from './net-vue'
1112
import type { TestCaseResponse } from './cache'
1213
import { Magic } from './magicKeys'
@@ -59,27 +60,44 @@ const sendRequest = async () => {
5960
}
6061
Magic.Keys(sendRequest, ['Alt+S', 'Alt+ß'])
6162
63+
const runTestCaseResultHandler = (e: any) => {
64+
requestLoading.value = false
65+
handleTestResult(e)
66+
}
6267
const runTestCase = () => {
6368
requestLoading.value = true
6469
const name = props.name
6570
const suite = props.suite
66-
API.RunTestCase({
71+
const request = {
6772
suiteName: suite,
6873
name: name,
6974
parameters: parameters.value
70-
}, (e) => {
71-
handleTestResult(e)
72-
requestLoading.value = false
73-
}, (e) => {
74-
parameters.value = []
75+
} as RunTestCaseRequest
76+
77+
if (batchRunMode.value) {
78+
API.BatchRunTestCase({
79+
count: batchRunCount.value,
80+
interval: batchRunInterval.value,
81+
request: request
82+
}, runTestCaseResultHandler, (e) => {
83+
parameters.value = []
84+
85+
requestLoading.value = false
86+
UIAPI.ErrorTip(e)
87+
parseResponseBody(e.body)
88+
})
89+
} else {
90+
API.RunTestCase(request, runTestCaseResultHandler, (e) => {
91+
parameters.value = []
7592
76-
requestLoading.value = false
77-
UIAPI.ErrorTip(e)
78-
parseResponseBody(e.body)
79-
})
93+
requestLoading.value = false
94+
UIAPI.ErrorTip(e)
95+
parseResponseBody(e.body)
96+
})
97+
}
8098
}
8199
82-
const parseResponseBody = (body) => {
100+
const parseResponseBody = (body: any) => {
83101
if (body === '') {
84102
return
85103
}
@@ -93,7 +111,7 @@ const parseResponseBody = (body) => {
93111
}
94112
}
95113
96-
const handleTestResult = (e) => {
114+
const handleTestResult = (e: any) => {
97115
testResult.value = e;
98116
99117
if (!isHistoryTestCase.value) {
@@ -149,6 +167,13 @@ function responseBodyFilter() {
149167
}
150168
151169
const parameterDialogOpened = ref(false)
170+
const batchRunMode = ref(false)
171+
const batchRunCount = ref(1)
172+
const batchRunInterval = ref('1s')
173+
const openBatchRunDialog = () => {
174+
batchRunMode.value = true
175+
openParameterDialog()
176+
}
152177
function openParameterDialog() {
153178
API.GetTestSuite(props.suite, (e) => {
154179
parameters.value = e.param
@@ -159,6 +184,7 @@ function openParameterDialog() {
159184
function sendRequestWithParameter() {
160185
parameterDialogOpened.value = false
161186
sendRequest()
187+
batchRunMode.value = false
162188
}
163189
164190
function generateCode() {
@@ -915,6 +941,7 @@ Magic.Keys(() => {
915941
<template #dropdown>
916942
<el-dropdown-menu>
917943
<el-dropdown-item @click="openParameterDialog">{{ t('button.sendWithParam') }}</el-dropdown-item>
944+
<el-dropdown-item @click="openBatchRunDialog">Batch Send</el-dropdown-item>
918945
</el-dropdown-menu>
919946
</template>
920947
</el-dropdown>
@@ -1238,6 +1265,24 @@ Magic.Keys(() => {
12381265
<h4>{{ t('title.apiRequestParameter') }}</h4>
12391266
</template>
12401267
<template #default>
1268+
<div v-if="batchRunMode">
1269+
<el-row>
1270+
<el-col :span="6">
1271+
Count:
1272+
</el-col>
1273+
<el-col :span="18">
1274+
<el-input v-model="batchRunCount" type="number" min="1" max="100"/>
1275+
</el-col>
1276+
</el-row>
1277+
<el-row>
1278+
<el-col :span="6">
1279+
Interval:
1280+
</el-col>
1281+
<el-col :span="18">
1282+
<el-input v-model="batchRunInterval" />
1283+
</el-col>
1284+
</el-row>
1285+
</div>
12411286
<el-table :data="parameters" style="width: 100%"
12421287
:empty-text="t('tip.noParameter')">
12431288
<el-table-column :label="t('field.key')" width="180">

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

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,12 @@ interface RunTestCaseRequest {
282282
parameters: any
283283
}
284284

285+
interface BatchRunTestCaseRequest {
286+
count: number
287+
interval: string
288+
request: RunTestCaseRequest
289+
}
290+
285291
function RunTestCase(request: RunTestCaseRequest,
286292
callback: (d: any) => void, errHandle?: (e: any) => void | null) {
287293
const requestOptions = {
@@ -301,6 +307,45 @@ function RunTestCase(request: RunTestCaseRequest,
301307
.then(callback).catch(emptyOrDefault(errHandle))
302308
}
303309

310+
const BatchRunTestCase = (request: BatchRunTestCaseRequest,
311+
callback: (d: any) => void, errHandle?: (e: any) => void | null) => {
312+
const requestOptions = {
313+
method: 'POST',
314+
headers: {
315+
'X-Store-Name': Cache.GetCurrentStore().name,
316+
'Accept': 'text/event-stream',
317+
'X-Auth': getToken()
318+
},
319+
body: JSON.stringify({
320+
suiteName: request.request.suiteName,
321+
caseName: request.request.name,
322+
parameters: request.request.parameters,
323+
count: request.count,
324+
interval: request.interval,
325+
})
326+
}
327+
fetch(`/api/v1/batchRun`, requestOptions)
328+
.then((response: any) => {
329+
if (response.ok) {
330+
const read = (reader: any) => {
331+
reader.read().then((data: any) => {
332+
if (data.done) {
333+
return;
334+
}
335+
336+
const value = data.value;
337+
const chunk = new TextDecoder().decode(value, { stream: true });
338+
callback(JSON.parse(chunk).result.testCaseResult[0]);
339+
read(reader);
340+
});
341+
}
342+
read(response.body.getReader());
343+
} else {
344+
return DefaultResponseProcess(response)
345+
}
346+
}).catch(emptyOrDefault(errHandle))
347+
}
348+
304349
function DuplicateTestCase(sourceSuiteName: string, targetSuiteName: string,
305350
sourceTestCaseName: string, targetTestCaseName: string,
306351
callback: (d: any) => void, errHandle?: ((reason: any) => PromiseLike<never>) | undefined | null ) {
@@ -690,7 +735,7 @@ export const API = {
690735
DefaultResponseProcess,
691736
GetVersion,
692737
CreateTestSuite, UpdateTestSuite, ImportTestSuite, GetTestSuite, DeleteTestSuite, ConvertTestSuite, DuplicateTestSuite, GetTestSuiteYaml,
693-
CreateTestCase, UpdateTestCase, GetTestCase, ListTestCase, DeleteTestCase, RunTestCase,
738+
CreateTestCase, UpdateTestCase, GetTestCase, ListTestCase, DeleteTestCase, RunTestCase, BatchRunTestCase,
694739
GetHistoryTestCaseWithResult, DeleteHistoryTestCase,GetHistoryTestCase, GetTestCaseAllHistory, DeleteAllHistoryTestCase, DownloadResponseFile,
695740
GenerateCode, ListCodeGenerator, HistoryGenerateCode,
696741
PopularHeaders,

‎console/atest-ui/src/views/store.ts‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import type { Pair } from './types'
1717

1818
interface Store {
1919
name: string;
20+
link: string;
2021
params: Pair[];
2122
}
2223

@@ -37,7 +38,8 @@ const storeExtensions = [
3738
}, {
3839
key: 'name',
3940
description: 'See also: git config --local user.name xxx'
40-
}]
41+
}],
42+
link: 'https://github.com/LinuxSuRen/atest-ext-store-git'
4143
},
4244
{
4345
name: 'atest-store-s3',
@@ -55,26 +57,29 @@ const storeExtensions = [
5557
key: 'forcepathstyle'
5658
}, {
5759
key: 'bucket'
58-
}]
60+
}],
61+
link: 'https://github.com/LinuxSuRen/atest-ext-store-s3'
5962
},
6063
{
6164
name: 'atest-store-orm',
6265
params: [{
6366
key: 'driver',
6467
defaultValue: 'mysql',
65-
description: 'Supported: mysql, postgres'
68+
description: 'Supported: mysql, postgres, sqlite'
6669
}, {
6770
key: 'database',
6871
defaultValue: 'atest'
6972
}, {
7073
key: 'historyLimit',
7174
defaultValue: '',
7275
description: 'Set the limit of the history record count'
73-
}]
76+
}],
77+
link: 'https://github.com/LinuxSuRen/atest-ext-store-orm'
7478
},
7579
{
7680
name: 'atest-store-etcd',
77-
params: []
81+
params: [],
82+
link: 'https://github.com/LinuxSuRen/atest-ext-store-etcd'
7883
},
7984
{
8085
name: 'atest-store-mongodb',
@@ -83,7 +88,8 @@ const storeExtensions = [
8388
}, {
8489
key: 'database',
8590
defaultValue: 'atest'
86-
}]
91+
}],
92+
link: 'https://github.com/LinuxSuRen/atest-ext-store-mongodb'
8793
}
8894
] as Store[]
8995

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,5 @@ require (
9090
golang.org/x/text v0.14.0 // indirect
9191
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
9292
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
93-
gopkg.in/yaml.v2 v2.4.0
93+
gopkg.in/yaml.v2 v2.4.0 // indirect
9494
)

‎pkg/runner/monitor/monitor.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/runner/monitor/monitor_grpc.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/server/remote_server.go‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
reflect "reflect"
3030
"regexp"
3131
"strings"
32+
"time"
3233

3334
"github.com/prometheus/client_golang/prometheus"
3435
"github.com/prometheus/client_golang/prometheus/promauto"
@@ -294,6 +295,54 @@ func (s *server) Run(ctx context.Context, task *TestTask) (reply *TestResult, er
294295
return
295296
}
296297

298+
func (s *server) BatchRun(srv Runner_BatchRunServer) (err error) {
299+
ctx := srv.Context()
300+
for {
301+
select {
302+
case <-ctx.Done():
303+
return ctx.Err()
304+
default:
305+
var in *BatchTestTask
306+
in, err = srv.Recv()
307+
if err != nil {
308+
if err == io.EOF {
309+
return nil
310+
}
311+
return err
312+
}
313+
314+
for i := 0; i < int(in.Count); i++ {
315+
var reply *TestCaseResult
316+
if reply, err = s.RunTestCase(ctx, &TestCaseIdentity{
317+
Suite: in.SuiteName,
318+
Testcase: in.CaseName,
319+
}); err != nil {
320+
return
321+
}
322+
323+
if err = srv.Send(&TestResult{
324+
TestCaseResult: []*TestCaseResult{reply},
325+
Error: reply.Error,
326+
}); err != nil {
327+
return err
328+
}
329+
330+
var interval string
331+
if interval, err = render.Render("batch run interval", in.Interval, nil); err != nil {
332+
return
333+
}
334+
335+
var duration time.Duration
336+
if duration, err = time.ParseDuration(interval); err != nil {
337+
return
338+
}
339+
time.Sleep(duration)
340+
}
341+
}
342+
}
343+
return
344+
}
345+
297346
func handleLargeResponseBody(resp runner.SimpleResponse, suite string, caseName string) (reply runner.SimpleResponse, err error) {
298347
const maxSize = 5120
299348
prefix := "isFilePath-" + strings.Join([]string{suite, caseName}, "-")

0 commit comments

Comments
 (0)