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

fix: failed to regenerate .debugtalk_gen.py correctly

Browse Source
This commit is contained in:
xucong053
2022-05-31 20:11:27 +08:00
parent b9e8b3fbba
commit a1b5e554da
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hrp/build.go
View File

@@ -155,7 +155,7 @@ func (t *TemplateContent) parsePyContent(path string) error {
}
func (t *TemplateContent) genDebugTalk(path string, templ string) error {
file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o666)
file, err := os.Create(path)
if err != nil {
log.Error().Err(err).Msg("open file failed")
return err
@@ -262,7 +262,7 @@ func buildPy(path string, output string) error {
return err
}
// generate debugtalk.py
// generate .debugtalk_gen.py
if output == "" {
dir, _ := os.Getwd()
output = filepath.Join(dir, PluginPySourceGenFile)
@@ -270,17 +270,7 @@ func buildPy(path string, output string) error {
output = filepath.Join(output, PluginPySourceGenFile)
}
err = templateContent.genDebugTalk(output, pyTemplate)
if err != nil {
return err
}
// ensure funppy in .env
_, err = builtin.EnsurePython3Venv("funppy")
if err != nil {
return err
}
return nil
return err
}
func BuildPlugin(path string, output string) (err error) {

21
hrp/plugin.go
View File

@@ -5,6 +5,7 @@ import (
"os"
"os/signal"
"path/filepath"
"strings"
"syscall"
"github.com/httprunner/funplugin"
@@ -34,6 +35,17 @@ func initPlugin(path string, logOn bool) (plugin funplugin.IPlugin, err error) {
return nil, nil
}
if strings.HasSuffix(pluginPath, ".py") {
// register funppy plugin
genPyPluginPath := filepath.Join(filepath.Dir(pluginPath), PluginPySourceGenFile)
err = BuildPlugin(pluginPath, genPyPluginPath)
if err != nil {
log.Error().Err(err).Str("path", pluginPath).Msg("build plugin failed")
return nil, nil
}
pluginPath = genPyPluginPath
}
// found plugin file
plugin, err = funplugin.Init(pluginPath, funplugin.WithLogOn(logOn))
if err != nil {
@@ -73,14 +85,7 @@ func locatePlugin(path string) (pluginPath string, err error) {
pluginPath, err = locateFile(path, PluginPySourceFile)
if err == nil {
// register funppy plugin
genPyPluginPath := filepath.Join(filepath.Dir(pluginPath), PluginPySourceGenFile)
err = BuildPlugin(pluginPath, genPyPluginPath)
if err != nil {
log.Error().Err(err).Str("path", pluginPath).Msg("build plugin failed")
return
}
return genPyPluginPath, nil
return
}
pluginPath, err = locateFile(path, PluginGoBuiltFile)