mirror of
https://github.com/httprunner/httprunner.git
synced 2026-09-05 07:26:55 +08:00
fix: failed to regenerate .debugtalk_gen.py correctly
This commit is contained in:
+3
-13
@@ -155,7 +155,7 @@ func (t *TemplateContent) parsePyContent(path string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (t *TemplateContent) genDebugTalk(path string, templ 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 {
|
if err != nil {
|
||||||
log.Error().Err(err).Msg("open file failed")
|
log.Error().Err(err).Msg("open file failed")
|
||||||
return err
|
return err
|
||||||
@@ -262,7 +262,7 @@ func buildPy(path string, output string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// generate debugtalk.py
|
// generate .debugtalk_gen.py
|
||||||
if output == "" {
|
if output == "" {
|
||||||
dir, _ := os.Getwd()
|
dir, _ := os.Getwd()
|
||||||
output = filepath.Join(dir, PluginPySourceGenFile)
|
output = filepath.Join(dir, PluginPySourceGenFile)
|
||||||
@@ -270,17 +270,7 @@ func buildPy(path string, output string) error {
|
|||||||
output = filepath.Join(output, PluginPySourceGenFile)
|
output = filepath.Join(output, PluginPySourceGenFile)
|
||||||
}
|
}
|
||||||
err = templateContent.genDebugTalk(output, pyTemplate)
|
err = templateContent.genDebugTalk(output, pyTemplate)
|
||||||
if err != nil {
|
return err
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// ensure funppy in .env
|
|
||||||
_, err = builtin.EnsurePython3Venv("funppy")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func BuildPlugin(path string, output string) (err error) {
|
func BuildPlugin(path string, output string) (err error) {
|
||||||
|
|||||||
+13
-8
@@ -5,6 +5,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"github.com/httprunner/funplugin"
|
"github.com/httprunner/funplugin"
|
||||||
@@ -34,6 +35,17 @@ func initPlugin(path string, logOn bool) (plugin funplugin.IPlugin, err error) {
|
|||||||
return nil, nil
|
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
|
// found plugin file
|
||||||
plugin, err = funplugin.Init(pluginPath, funplugin.WithLogOn(logOn))
|
plugin, err = funplugin.Init(pluginPath, funplugin.WithLogOn(logOn))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -73,14 +85,7 @@ func locatePlugin(path string) (pluginPath string, err error) {
|
|||||||
|
|
||||||
pluginPath, err = locateFile(path, PluginPySourceFile)
|
pluginPath, err = locateFile(path, PluginPySourceFile)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
// register funppy plugin
|
return
|
||||||
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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pluginPath, err = locateFile(path, PluginGoBuiltFile)
|
pluginPath, err = locateFile(path, PluginGoBuiltFile)
|
||||||
|
|||||||
Reference in New Issue
Block a user