diff --git a/hrp/plugin.go b/hrp/plugin.go index 952fbe9c..7d00540c 100644 --- a/hrp/plugin.go +++ b/hrp/plugin.go @@ -22,17 +22,15 @@ const ( projectInfoFile = "proj.json" // used for ensuring root project ) -func initPlugin(path string, logOn bool) (plugin funplugin.IPlugin, pluginDir string, err error) { +func initPlugin(path string, logOn bool) (plugin funplugin.IPlugin, err error) { // plugin file not found if path == "" { - return nil, "", nil + return nil, nil } pluginPath, err := locatePlugin(path) if err != nil { - return nil, "", nil + return nil, nil } - // TODO: move pluginDir to funplugin - pluginDir = filepath.Dir(pluginPath) // found plugin file plugin, err = funplugin.Init(pluginPath, funplugin.WithLogOn(logOn)) diff --git a/hrp/runner.go b/hrp/runner.go index 640e7af3..66bc6a9b 100644 --- a/hrp/runner.go +++ b/hrp/runner.go @@ -5,6 +5,7 @@ import ( "net" "net/http" "net/url" + "path/filepath" "testing" "time" @@ -231,12 +232,12 @@ func (r *HRPRunner) newCaseRunner(testcase *TestCase) (*testCaseRunner, error) { } // init parser plugin - plugin, pluginDir, err := initPlugin(testcase.Config.Path, r.pluginLogOn) + plugin, err := initPlugin(testcase.Config.Path, r.pluginLogOn) if err != nil { return nil, errors.Wrap(err, "init plugin failed") } runner.parser.plugin = plugin - runner.rootDir = pluginDir + runner.rootDir = filepath.Dir(plugin.Path()) // parse testcase config if err := runner.parseConfig(); err != nil {