Merge pull request #9 from vearne/develop

Develop

Author: vearne

config_files/autotest.yml

@@ -1,10 +1,12 @@
 # my global config
 global:
 #  worker_num: 5
-  worker_num: 1
+  worker_num: 5
   # default: true
   ignore_testcase_fail: true
   debug: false
+  # Timeout setting for each request
+  request_timeout: 5s
 
   logger:
     # 1. "info"

config_files/my_http_api.yml

@@ -1,6 +1,6 @@
 - id: 1
+  desc: "list all books"
   request:
-    # optional
     method: "get"
     url: "http://{{ HOST }}/api/books"
   rules:
@@ -11,6 +11,7 @@
       Expected: "Effective Go"
 
 - id: 2
+  desc: "add a new book"
   request:
     # optional
     method: "post"
@@ -36,6 +37,7 @@
     type: integer
 
 - id: 3
+  desc: "modify the book3"
   # Depends on TestCase2
   # TestCase2 must be executed first
   dependOnIDs: [2]
@@ -60,6 +62,7 @@
       Expected: "book3_author-2"
 
 - id: 4
+  desc: "delete the book1"
   request:
     # optional
     method: "delete"
@@ -71,6 +74,9 @@
       expectedStatus: 204
 
 - id: 5
+  desc: "try to get book1"
+  # Delay for 5 seconds before executing
+  delay: 5s
   dependOnIDs: [4]
   request:
     # optional

internal/command/http_automate.go

@@ -33,6 +33,11 @@ func HttpAutomateTest(httpTestCases map[string][]*config.TestCase) {
 	successCount := 0
 	failedCount := 0
 	for filePath := range httpTestCases {
+		// if ignore_testcase_fail is false and some testcases have failed.
+		if resource.TerminationFlag.Load() {
+			break
+		}
+
 		info := HandleSingleFile(workerNum, filePath)
 		finishCount += info.Total
 		successCount += info.SuccessCount
@@ -102,6 +107,11 @@ func HandleSingleFile(workerNum int, filePath string) *ResultInfo {
 			successCount++
 		} else {
 			failedCount++
+			// terminate subsequent testcases
+			if !resource.GlobalConfig.Global.IgnoreTestCaseFail {
+				resource.TerminationFlag.Store(true)
+				break
+			}
 		}
 
 		stateGroup.SetState(tcResult.ID, tcResult.State)

internal/command/http_call.go

@@ -10,6 +10,7 @@ import (
 	"github.com/vearne/zaplog"
 	"go.uber.org/zap"
 	"strings"
+	"time"
 )
 
 type HttpTestCaseResult struct {
@@ -56,6 +57,11 @@ func (m *HttpTestCallable) Call(ctx context.Context) *executor.GPResult {
 		}
 	}
 
+	if m.testcase.Delay > 0 {
+		zaplog.Debug("sleep", zap.Any("delay", m.testcase.Delay))
+		time.Sleep(m.testcase.Delay)
+	}
+
 	zaplog.Debug("before render()", zap.Any("request", m.testcase.Request))
 	req, err := render(m.testcase.Request)
 	tcResult.Request = req
@@ -69,7 +75,10 @@ func (m *HttpTestCallable) Call(ctx context.Context) *executor.GPResult {
 		return &r
 	}
 
-	in := resource.RestyClient.R()
+	ctx, cancel := context.WithTimeout(context.Background(), resource.GlobalConfig.Global.RequestTimeout)
+	defer cancel()
+
+	in := resource.RestyClient.R().SetContext(ctx)
 	for _, item := range req.Headers {
 		strList := strings.Split(item, ":")
 		in.SetHeader(strings.TrimSpace(strList[0]), strings.TrimSpace(strList[1]))

internal/config/config.go

@@ -2,13 +2,15 @@ package config
 
 import (
 	"github.com/vearne/autotest/internal/rule"
+	"time"
 )
 
 type AutoTestConfig struct {
 	Global struct {
-		WorkerNum          int  `yaml:"worker_num"`
-		IgnoreTestCaseFail bool `yaml:"ignore_testcase_fail"`
-		Debug              bool `yaml:"debug"`
+		WorkerNum          int           `yaml:"worker_num"`
+		IgnoreTestCaseFail bool          `yaml:"ignore_testcase_fail"`
+		Debug              bool          `yaml:"debug"`
+		RequestTimeout     time.Duration `yaml:"request_timeout"`
 		Logger             struct {
 			Level    string `yaml:"level"`
 			FilePath string `yaml:"filepath"`
@@ -20,7 +22,10 @@ type AutoTestConfig struct {
 }
 
 type TestCase struct {
-	ID          uint64           `yaml:"id"`
+	ID   uint64 `yaml:"id"`
+	Desc string `yaml:"desc"`
+	// Delay for a while before executing
+	Delay       time.Duration    `yaml:"delay,omitempty"`
 	Request     Request          `yaml:"request"`
 	OriginRules []map[string]any `yaml:"rules" json:"-"`
 	DependOnIDs []uint64         `yaml:"dependOnIDs,omitempty"`

internal/resource/resource.go

@@ -13,6 +13,7 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
+	"sync/atomic"
 )
 
 var GlobalConfig config.AutoTestConfig
@@ -22,10 +23,12 @@ var EnvVars map[string]string
 var CustomerVars sync.Map
 
 var RestyClient *resty.Client
+var TerminationFlag atomic.Bool
 
 func init() {
 	EnvVars = make(map[string]string, 10)
 	HttpTestCases = make(map[string][]*config.TestCase, 10)
+	TerminationFlag.Store(false)
 }
 
 func InitRestyClient(debug bool) {