GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-12 16:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: results dir

Browse Source
This commit is contained in:
debugtalk
2022-12-16 00:17:57 +08:00
parent 088974ddee
commit 0e0a4152cb
12 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hrp/internal/dial/curl.go
View File

@@ -4,7 +4,6 @@ import (
"bytes"
"fmt"
"path/filepath"
"time"
"github.com/rs/zerolog/log"
@@ -36,7 +35,7 @@ func DoCurl(args []string) (err error) {
var curlResult CurlResult
defer func() {
if saveTests {
curlResultName := fmt.Sprintf("curl_result_%v.json", time.Now().Format("20060102150405"))
curlResultName := fmt.Sprintf("curl_result_%v.json", env.StartTimeStr)
curlResultPath := filepath.Join(env.RootDir, curlResultName)
err = builtin.Dump2JSON(curlResult, curlResultPath)
if err != nil {

2
hrp/internal/dial/dns.go
View File

@@ -210,7 +210,7 @@ func DoDns(dnsOptions *DnsOptions, args []string) (err error) {
var dnsResult DnsResult
defer func() {
if dnsOptions.SaveTests {
dnsResultName := fmt.Sprintf("dns_result_%v.json", time.Now().Format("20060102150405"))
dnsResultName := fmt.Sprintf("dns_result_%v.json", env.StartTimeStr)
dnsResultPath := filepath.Join(env.RootDir, dnsResultName)
err = builtin.Dump2JSON(dnsResult, dnsResultPath)
if err != nil {

2
hrp/internal/dial/ping.go
View File

@@ -46,7 +46,7 @@ func DoPing(pingOptions *PingOptions, args []string) (err error) {
var pingResult PingResult
defer func() {
if pingOptions.SaveTests {
pingResultName := fmt.Sprintf("ping_result_%v.json", time.Now().Format("20060102150405"))
pingResultName := fmt.Sprintf("ping_result_%v.json", env.StartTimeStr)
pingResultPath := filepath.Join(env.RootDir, pingResultName)
err = builtin.Dump2JSON(pingResult, pingResultPath)
if err != nil {

2
hrp/internal/dial/traceroute_unix.go
View File

@@ -34,7 +34,7 @@ func DoTraceRoute(traceRouteOptions *TraceRouteOptions, args []string) (err erro
var traceRouteResult TraceRouteResult
defer func() {
if traceRouteOptions.SaveTests {
traceRouteResultName := fmt.Sprintf("traceroute_result_%v.json", time.Now().Format("20060102150405"))
traceRouteResultName := fmt.Sprintf("traceroute_result_%v.json", env.StartTimeStr)
traceRouteResultPath := filepath.Join(env.RootDir, traceRouteResultName)
err = builtin.Dump2JSON(traceRouteResult, traceRouteResultPath)
if err != nil {

2
hrp/internal/dial/traceroute_windows.go
View File

@@ -32,7 +32,7 @@ func DoTraceRoute(traceRouteOptions *TraceRouteOptions, args []string) (err erro
var traceRouteResult TraceRouteResult
defer func() {
if traceRouteOptions.SaveTests {
traceRouteResultName := fmt.Sprintf("traceroute_result_%v.json", time.Now().Format("20060102150405"))
traceRouteResultName := fmt.Sprintf("traceroute_result_%v.json", env.StartTimeStr)
traceRouteResultPath := filepath.Join(env.RootDir, traceRouteResultName)
err = builtin.Dump2JSON(traceRouteResult, traceRouteResultPath)
if err != nil {

10
hrp/internal/env/env.go vendored
View File

@@ -3,6 +3,7 @@ package env
import (
"os"
"path/filepath"
"time"
)
var (
@@ -19,13 +20,17 @@ var (
)
const (
ResultsDir = "results"
ResultsDirName = "results"
ScreenshotsDirName = "screenshots"
)
var (
RootDir string
ResultsDir string
ResultsPath string
ScreenShotsPath string
StartTime = time.Now()
StartTimeStr = StartTime.Format("20060102150405")
)
func init() {
@@ -35,6 +40,7 @@ func init() {
panic(err)
}
ResultsDir = filepath.Join(ResultsDirName, StartTimeStr)
ResultsPath = filepath.Join(RootDir, ResultsDir)
ScreenShotsPath = filepath.Join(ResultsPath, "screenshots")
ScreenShotsPath = filepath.Join(ResultsPath, ScreenshotsDirName)
}

4
hrp/internal/scaffold/main.go
View File

@@ -92,10 +92,10 @@ func CreateScaffold(projectName string, pluginType PluginType, venv string, forc
if err := builtin.CreateFolder(filepath.Join(projectName, "testcases")); err != nil {
return err
}
if err := builtin.CreateFolder(filepath.Join(projectName, env.ResultsDir)); err != nil {
if err := builtin.CreateFolder(filepath.Join(projectName, env.ResultsDirName)); err != nil {
return err
}
if err := builtin.CreateFile(filepath.Join(projectName, env.ResultsDir, ".keep"), ""); err != nil {
if err := builtin.CreateFile(filepath.Join(projectName, env.ResultsDirName, ".keep"), ""); err != nil {
return err
}