GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-09 22:44:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename env package to config

Browse Source
This commit is contained in:
lilong.129
2024-10-16 15:36:37 +08:00
parent a4236eea39
commit f9044eabe3
13 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hrp/build.go
View File

@@ -17,7 +17,7 @@ import (
"github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/code"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin" "github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/config"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk" "github.com/httprunner/httprunner/v4/hrp/internal/sdk"
"github.com/httprunner/httprunner/v4/hrp/internal/version" "github.com/httprunner/httprunner/v4/hrp/internal/version"
) )
@@ -107,7 +107,7 @@ func (pt *pluginTemplate) generate(tmpl, output string) error {
func (pt *pluginTemplate) generatePy(output string) error { func (pt *pluginTemplate) generatePy(output string) error {
// specify output file path // specify output file path
if output == "" { if output == "" {
output = filepath.Join(env.RootDir, PluginPySourceGenFile) output = filepath.Join(config.RootDir, PluginPySourceGenFile)
} else if builtin.IsFolderPathExists(output) { } else if builtin.IsFolderPathExists(output) {
output = filepath.Join(output, PluginPySourceGenFile) output = filepath.Join(output, PluginPySourceGenFile)
} }
@@ -155,7 +155,7 @@ func (pt *pluginTemplate) generateGo(output string) error {
// specify output file path // specify output file path
if output == "" { if output == "" {
output = filepath.Join(env.RootDir, PluginHashicorpGoBuiltFile) output = filepath.Join(config.RootDir, PluginHashicorpGoBuiltFile)
} else if builtin.IsFolderPathExists(output) { } else if builtin.IsFolderPathExists(output) {
output = filepath.Join(output, PluginHashicorpGoBuiltFile) output = filepath.Join(output, PluginHashicorpGoBuiltFile)
} }

4
hrp/cmd/ios/pcap.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin" "github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/config"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk" "github.com/httprunner/httprunner/v4/hrp/internal/sdk"
"github.com/httprunner/httprunner/v4/hrp/pkg/uixt" "github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
) )
@@ -51,7 +51,7 @@ var pcapCmd = &cobra.Command{
log.Fatal().Err(err).Msg("failed to init ios device") log.Fatal().Err(err).Msg("failed to init ios device")
} }
err = builtin.EnsureFolderExists(env.ResultsPath) err = builtin.EnsureFolderExists(config.ResultsPath)
if err != nil { if err != nil {
return err return err
} }

4
hrp/cmd/ios/perf.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin" "github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/config"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk" "github.com/httprunner/httprunner/v4/hrp/internal/sdk"
"github.com/httprunner/httprunner/v4/hrp/pkg/uixt" "github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
) )
@@ -58,7 +58,7 @@ var perfCmd = &cobra.Command{
log.Fatal().Err(err).Msg("failed to init ios device") log.Fatal().Err(err).Msg("failed to init ios device")
} }
err = builtin.EnsureFolderExists(env.ResultsPath) err = builtin.EnsureFolderExists(config.ResultsPath)
if err != nil { if err != nil {
return err return err
} }

2
hrp/internal/env/env.go → hrp/internal/config/config.go
View File

@@ -1,4 +1,4 @@
package env package config
import ( import (
"os" "os"

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

@@ -14,7 +14,7 @@ import (
"github.com/httprunner/httprunner/v4/hrp" "github.com/httprunner/httprunner/v4/hrp"
"github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/code"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin" "github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/config"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk" "github.com/httprunner/httprunner/v4/hrp/internal/sdk"
"github.com/httprunner/httprunner/v4/hrp/internal/version" "github.com/httprunner/httprunner/v4/hrp/internal/version"
) )
@@ -96,10 +96,10 @@ func CreateScaffold(projectName string, pluginType PluginType, venv string, forc
if err := builtin.CreateFolder(filepath.Join(projectName, "testcases")); err != nil { if err := builtin.CreateFolder(filepath.Join(projectName, "testcases")); err != nil {
return err return err
} }
if err := builtin.CreateFolder(filepath.Join(projectName, env.ResultsDirName)); err != nil { if err := builtin.CreateFolder(filepath.Join(projectName, config.ResultsDirName)); err != nil {
return err return err
} }
if err := builtin.CreateFile(filepath.Join(projectName, env.ResultsDirName, ".keep"), ""); err != nil { if err := builtin.CreateFile(filepath.Join(projectName, config.ResultsDirName, ".keep"), ""); err != nil {
return err return err
} }

2
hrp/internal/version/VERSION
View File

@@ -1 +1 @@
v5.0.0-beta-2410161532 v5.0.0-beta-2410161536

8
hrp/pkg/uixt/android_adb_driver.go
View File

@@ -19,7 +19,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/code"
"github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/config"
"github.com/httprunner/httprunner/v4/hrp/pkg/gadb" "github.com/httprunner/httprunner/v4/hrp/pkg/gadb"
"github.com/httprunner/httprunner/v4/hrp/pkg/utf7" "github.com/httprunner/httprunner/v4/hrp/pkg/utf7"
) )
@@ -699,10 +699,10 @@ func (ad *adbDriver) StopCaptureLog() (result interface{}, err error) {
// 没有解析到打点日志，走兜底逻辑 // 没有解析到打点日志，走兜底逻辑
if len(pointRes) == 0 { if len(pointRes) == 0 {
log.Info().Msg("action log is null, use action file >>>") log.Info().Msg("action log is null, use action file >>>")
logFilePathPrefix := fmt.Sprintf("%v/data", env.ActionLogFilePath) logFilePathPrefix := fmt.Sprintf("%v/data", config.ActionLogFilePath)
files := []string{} files := []string{}
myexec.RunCommand("adb", "-s", ad.adbClient.Serial(), "pull", env.DeviceActionLogFilePath, env.ActionLogFilePath) myexec.RunCommand("adb", "-s", ad.adbClient.Serial(), "pull", config.DeviceActionLogFilePath, config.ActionLogFilePath)
err = filepath.Walk(env.ActionLogFilePath, func(path string, info fs.FileInfo, err error) error { err = filepath.Walk(config.ActionLogFilePath, func(path string, info fs.FileInfo, err error) error {
// 只是需要日志文件 // 只是需要日志文件
if ok := strings.Contains(path, logFilePathPrefix); ok { if ok := strings.Contains(path, logFilePathPrefix); ok {
files = append(files, path) files = append(files, path)

4
hrp/pkg/uixt/android_device.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/code"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin" "github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/config"
"github.com/httprunner/httprunner/v4/hrp/internal/json" "github.com/httprunner/httprunner/v4/hrp/internal/json"
"github.com/httprunner/httprunner/v4/hrp/pkg/gadb" "github.com/httprunner/httprunner/v4/hrp/pkg/gadb"
) )
@@ -195,7 +195,7 @@ type AndroidDevice struct {
func (dev *AndroidDevice) Init() error { func (dev *AndroidDevice) Init() error {
dev.d.RunShellCommand("ime", "enable", "io.appium.settings/.UnicodeIME") dev.d.RunShellCommand("ime", "enable", "io.appium.settings/.UnicodeIME")
dev.d.RunShellCommand("rm", "-r", env.DeviceActionLogFilePath) dev.d.RunShellCommand("rm", "-r", config.DeviceActionLogFilePath)
if dev.UIA2 { if dev.UIA2 {
// uiautomator2 server must be started before // uiautomator2 server must be started before

6
hrp/pkg/uixt/ext.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin" "github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/config"
) )
type DriverExt struct { type DriverExt struct {
@@ -42,10 +42,10 @@ func newDriverExt(device IDevice, driver IWebDriver, options ...DriverOption) (d
} }
if driverOptions.withResultFolder { if driverOptions.withResultFolder {
// create results directory // create results directory
if err = builtin.EnsureFolderExists(env.ResultsPath); err != nil { if err = builtin.EnsureFolderExists(config.ResultsPath); err != nil {
return nil, errors.Wrap(err, "create results directory failed") return nil, errors.Wrap(err, "create results directory failed")
} }
if err = builtin.EnsureFolderExists(env.ScreenShotsPath); err != nil { if err = builtin.EnsureFolderExists(config.ScreenShotsPath); err != nil {
return nil, errors.Wrap(err, "create screenshots directory failed") return nil, errors.Wrap(err, "create screenshots directory failed")
} }
} }

6
hrp/pkg/uixt/ios_device.go
View File

@@ -19,7 +19,7 @@ import (
"github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/code"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin" "github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/config"
"github.com/httprunner/httprunner/v4/hrp/pkg/gidevice" "github.com/httprunner/httprunner/v4/hrp/pkg/gidevice"
) )
@@ -383,7 +383,7 @@ func (dev *IOSDevice) StartPerf() error {
return err return err
} }
dev.perfFile = filepath.Join(env.ResultsPath, "perf.data") dev.perfFile = filepath.Join(config.ResultsPath, "perf.data")
file, err := os.OpenFile(dev.perfFile, file, err := os.OpenFile(dev.perfFile,
os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0o755) os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0o755)
if err != nil { if err != nil {
@@ -428,7 +428,7 @@ func (dev *IOSDevice) StartPcap() error {
return err return err
} }
dev.pcapFile = filepath.Join(env.ResultsPath, "dump.pcap") dev.pcapFile = filepath.Join(config.ResultsPath, "dump.pcap")
file, err := os.OpenFile(dev.pcapFile, file, err := os.OpenFile(dev.pcapFile,
os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0o755) os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0o755)
if err != nil { if err != nil {

4
hrp/pkg/uixt/screenshot.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/code"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin" "github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/config"
) )
type ScreenResult struct { type ScreenResult struct {
@@ -181,7 +181,7 @@ func (dExt *DriverExt) GetScreenShot(fileName string) (raw *bytes.Buffer, path s
} }
// save screenshot to file // save screenshot to file
path = filepath.Join(env.ScreenShotsPath, fileName) path = filepath.Join(config.ScreenShotsPath, fileName)
path, err = saveScreenShot(raw, path) path, err = saveScreenShot(raw, path)
if err != nil { if err != nil {
log.Error().Err(err).Msg("save screenshot file failed") log.Error().Err(err).Msg("save screenshot file failed")

4
hrp/plugin.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/code" "github.com/httprunner/httprunner/v4/hrp/code"
"github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/config"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk" "github.com/httprunner/httprunner/v4/hrp/internal/sdk"
) )
@@ -185,5 +185,5 @@ func GetProjectRootDirPath(path string) (rootDir string, err error) {
// failed to locate project root dir // failed to locate project root dir
// maybe project plugin debugtalk.xx and proj.json are not exist // maybe project plugin debugtalk.xx and proj.json are not exist
// use current dir instead // use current dir instead
return env.RootDir, nil return config.RootDir, nil
} }

10
hrp/summary.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin" "github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/env" "github.com/httprunner/httprunner/v4/hrp/internal/config"
"github.com/httprunner/httprunner/v4/hrp/internal/version" "github.com/httprunner/httprunner/v4/hrp/internal/version"
) )
@@ -27,7 +27,7 @@ func NewSummary() *Summary {
Success: true, Success: true,
Stat: &Stat{}, Stat: &Stat{},
Time: &TestCaseTime{ Time: &TestCaseTime{
StartAt: env.StartTime, StartAt: config.StartTime,
}, },
Platform: platForm, Platform: platForm,
} }
@@ -62,12 +62,12 @@ func (s *Summary) AddCaseSummary(caseSummary *TestCaseSummary) {
s.rootDir = caseSummary.RootDir s.rootDir = caseSummary.RootDir
} else if s.rootDir != caseSummary.RootDir { } else if s.rootDir != caseSummary.RootDir {
// if multiple testcases have different root path, use current working dir // if multiple testcases have different root path, use current working dir
s.rootDir = env.RootDir s.rootDir = config.RootDir
} }
} }
func (s *Summary) GenHTMLReport() error { func (s *Summary) GenHTMLReport() error {
reportsDir := filepath.Join(s.rootDir, env.ResultsDir) reportsDir := filepath.Join(s.rootDir, config.ResultsDir)
err := builtin.EnsureFolderExists(reportsDir) err := builtin.EnsureFolderExists(reportsDir)
if err != nil { if err != nil {
return err return err
@@ -97,7 +97,7 @@ func (s *Summary) GenHTMLReport() error {
} }
func (s *Summary) GenSummary() (path string, err error) { func (s *Summary) GenSummary() (path string, err error) {
reportsDir := filepath.Join(s.rootDir, env.ResultsDir) reportsDir := filepath.Join(s.rootDir, config.ResultsDir)
err = builtin.EnsureFolderExists(reportsDir) err = builtin.EnsureFolderExists(reportsDir)
if err != nil { if err != nil {
return "", err return "", err