fix #1288: unable to go get httprunner v4

This commit is contained in:
debugtalk
2022-05-09 18:49:24 +08:00
parent 69aa0b3ad1
commit 96ec10467b
48 changed files with 92 additions and 90 deletions

View File

@@ -7,6 +7,7 @@
**go version**
- fix: step request elapsed timing should contain ContentTransfer part
- fix #1288: unable to go get httprunner v4
**python version**

View File

@@ -36,4 +36,4 @@ Copyright 2017 debugtalk
* [hrp run](hrp_run.md) - run API test with go engine
* [hrp startproject](hrp_startproject.md) - create a scaffold project
###### Auto generated by spf13/cobra on 5-May-2022
###### Auto generated by spf13/cobra on 9-May-2022

View File

@@ -41,4 +41,4 @@ hrp boom [flags]
* [hrp](hrp.md) - Next-Generation API Testing Solution.
###### Auto generated by spf13/cobra on 5-May-2022
###### Auto generated by spf13/cobra on 9-May-2022

View File

@@ -18,4 +18,4 @@ hrp convert $path... [flags]
* [hrp](hrp.md) - Next-Generation API Testing Solution.
###### Auto generated by spf13/cobra on 5-May-2022
###### Auto generated by spf13/cobra on 9-May-2022

View File

@@ -24,4 +24,4 @@ hrp har2case $har_path... [flags]
* [hrp](hrp.md) - Next-Generation API Testing Solution.
###### Auto generated by spf13/cobra on 5-May-2022
###### Auto generated by spf13/cobra on 9-May-2022

View File

@@ -16,4 +16,4 @@ hrp pytest $path ... [flags]
* [hrp](hrp.md) - Next-Generation API Testing Solution.
###### Auto generated by spf13/cobra on 5-May-2022
###### Auto generated by spf13/cobra on 9-May-2022

View File

@@ -35,4 +35,4 @@ hrp run $path... [flags]
* [hrp](hrp.md) - Next-Generation API Testing Solution.
###### Auto generated by spf13/cobra on 5-May-2022
###### Auto generated by spf13/cobra on 9-May-2022

View File

@@ -20,4 +20,4 @@ hrp startproject $project_name [flags]
* [hrp](hrp.md) - Next-Generation API Testing Solution.
###### Auto generated by spf13/cobra on 5-May-2022
###### Auto generated by spf13/cobra on 9-May-2022

2
go.mod
View File

@@ -1,4 +1,4 @@
module github.com/httprunner/httprunner
module github.com/httprunner/httprunner/v4
go 1.16

View File

@@ -5,11 +5,11 @@ import (
"sync"
"time"
"github.com/httprunner/funplugin"
"github.com/rs/zerolog/log"
"github.com/httprunner/funplugin"
"github.com/httprunner/httprunner/hrp/internal/boomer"
"github.com/httprunner/httprunner/hrp/internal/sdk"
"github.com/httprunner/httprunner/v4/hrp/internal/boomer"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk"
)
func NewBoomer(spawnCount int, spawnRate float64) *HRPBoomer {

View File

@@ -5,8 +5,8 @@ import (
"github.com/spf13/cobra"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/hrp/internal/boomer"
"github.com/httprunner/httprunner/v4/hrp"
"github.com/httprunner/httprunner/v4/hrp/internal/boomer"
)
// boomCmd represents the boom command

View File

@@ -5,7 +5,7 @@ import (
"github.com/getsentry/sentry-go"
"github.com/httprunner/httprunner/hrp/cmd"
"github.com/httprunner/httprunner/v4/hrp/cmd"
)
func main() {

View File

@@ -7,7 +7,7 @@ import (
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/httprunner/httprunner/hrp/internal/convert"
"github.com/httprunner/httprunner/v4/hrp/internal/convert"
)
var convertCmd = &cobra.Command{

View File

@@ -6,7 +6,7 @@ import (
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/httprunner/httprunner/hrp/internal/har2case"
"github.com/httprunner/httprunner/v4/hrp/internal/har2case"
)
// har2caseCmd represents the har2case command

View File

@@ -3,7 +3,7 @@ package cmd
import (
"github.com/spf13/cobra"
"github.com/httprunner/httprunner/hrp/internal/pytest"
"github.com/httprunner/httprunner/v4/hrp/internal/pytest"
)
var pytestCmd = &cobra.Command{

View File

@@ -9,7 +9,7 @@ import (
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/httprunner/httprunner/hrp/internal/version"
"github.com/httprunner/httprunner/v4/hrp/internal/version"
)
// rootCmd represents the base command when called without any subcommands
@@ -33,7 +33,7 @@ Website: https://httprunner.com
Github: https://github.com/httprunner/httprunner
Copyright 2017 debugtalk`,
PersistentPreRun: func(cmd *cobra.Command, args []string) {
var noColor = false
noColor := false
if runtime.GOOS == "windows" {
noColor = true
}

View File

@@ -5,7 +5,7 @@ import (
"github.com/spf13/cobra"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/v4/hrp"
)
// runCmd represents the run command

View File

@@ -7,7 +7,7 @@ import (
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/httprunner/httprunner/hrp/internal/scaffold"
"github.com/httprunner/httprunner/v4/hrp/internal/scaffold"
)
var scaffoldCmd = &cobra.Command{

View File

@@ -3,7 +3,7 @@ package hrp
import (
"reflect"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
)
// NewConfig returns a new constructed testcase config with specified testcase name.
@@ -161,6 +161,4 @@ const (
thinkTimeDefaultMultiply = 1
)
var (
thinkTimeDefaultRandom = map[string]float64{"min_percentage": 0.5, "max_percentage": 1.5}
)
var thinkTimeDefaultRandom = map[string]float64{"min_percentage": 0.5, "max_percentage": 1.5}

View File

@@ -14,7 +14,7 @@ import (
"github.com/prometheus/client_golang/prometheus/push"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/hrp/internal/json"
"github.com/httprunner/httprunner/v4/hrp/internal/json"
)
// Output is primarily responsible for printing test results to different destinations
@@ -37,8 +37,7 @@ type Output interface {
}
// ConsoleOutput is the default output for standalone mode.
type ConsoleOutput struct {
}
type ConsoleOutput struct{}
// NewConsoleOutput returns a ConsoleOutput.
func NewConsoleOutput() *ConsoleOutput {
@@ -102,12 +101,10 @@ func getTotalFailRatio(totalRequests, totalFailures int64) (failRatio float64) {
// OnStart of ConsoleOutput has nothing to do.
func (o *ConsoleOutput) OnStart() {
}
// OnStop of ConsoleOutput has nothing to do.
func (o *ConsoleOutput) OnStop() {
}
// OnEvent will print to the console.

View File

@@ -3,7 +3,7 @@ package boomer
import (
"time"
"github.com/httprunner/httprunner/hrp/internal/json"
"github.com/httprunner/httprunner/v4/hrp/internal/json"
)
type transaction struct {

View File

@@ -13,12 +13,12 @@ import (
"strconv"
"strings"
"github.com/httprunner/funplugin/shared"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"gopkg.in/yaml.v3"
"github.com/httprunner/funplugin/shared"
"github.com/httprunner/httprunner/hrp/internal/json"
"github.com/httprunner/httprunner/v4/hrp/internal/json"
)
func Dump2JSON(data interface{}, path string) error {
@@ -29,7 +29,7 @@ func Dump2JSON(data interface{}, path string) error {
}
log.Info().Str("path", path).Msg("dump data to json")
file, _ := json.MarshalIndent(data, "", " ")
err = os.WriteFile(path, file, 0644)
err = os.WriteFile(path, file, 0o644)
if err != nil {
log.Error().Err(err).Msg("dump json path failed")
return err
@@ -56,7 +56,7 @@ func Dump2YAML(data interface{}, path string) error {
return err
}
err = os.WriteFile(path, buffer.Bytes(), 0644)
err = os.WriteFile(path, buffer.Bytes(), 0o644)
if err != nil {
log.Error().Err(err).Msg("dump yaml path failed")
return err

View File

@@ -7,10 +7,10 @@ import (
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/hrp/internal/sdk"
"github.com/httprunner/httprunner/hrp/internal/version"
"github.com/httprunner/httprunner/v4/hrp"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk"
"github.com/httprunner/httprunner/v4/hrp/internal/version"
)
func Convert2TestScripts(destType string, paths ...string) error {

View File

@@ -11,10 +11,10 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/hrp/internal/json"
"github.com/httprunner/httprunner/hrp/internal/sdk"
"github.com/httprunner/httprunner/v4/hrp"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/json"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk"
)
const (

View File

@@ -5,7 +5,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/v4/hrp"
)
var (
@@ -348,7 +348,8 @@ func TestMakeValidate(t *testing.T) {
Check: "status_code",
Expect: 200,
Assert: "equals",
Message: "assert response status code"}) {
Message: "assert response status code",
}) {
t.Fatal()
}
@@ -361,7 +362,8 @@ func TestMakeValidate(t *testing.T) {
Check: "headers.\"Content-Type\"",
Expect: "application/json; charset=utf-8",
Assert: "equals",
Message: "assert response header Content-Type"}) {
Message: "assert response header Content-Type",
}) {
t.Fatal()
}
@@ -374,7 +376,8 @@ func TestMakeValidate(t *testing.T) {
Check: "body.Code",
Expect: float64(200), // TODO
Assert: "equals",
Message: "assert response body Code"}) {
Message: "assert response body Code",
}) {
t.Fatal()
}
}

View File

@@ -3,9 +3,9 @@ package pytest
import (
"fmt"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/hrp/internal/sdk"
"github.com/httprunner/httprunner/hrp/internal/version"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk"
"github.com/httprunner/httprunner/v4/hrp/internal/version"
)
func RunPytest(args []string) error {

View File

@@ -7,12 +7,12 @@ import (
"os/exec"
"path/filepath"
"github.com/httprunner/funplugin/shared"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/httprunner/funplugin/shared"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/hrp/internal/sdk"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk"
)
type PluginType string

View File

@@ -5,7 +5,7 @@ import (
"net/url"
"time"
"github.com/httprunner/httprunner/hrp/internal/version"
"github.com/httprunner/httprunner/v4/hrp/internal/version"
)
type IEvent interface {

View File

@@ -9,7 +9,7 @@ import (
"github.com/google/uuid"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/hrp/internal/version"
"github.com/httprunner/httprunner/v4/hrp/internal/version"
)
const (

View File

@@ -9,12 +9,12 @@ import (
"regexp"
"strings"
"github.com/httprunner/funplugin"
"github.com/httprunner/funplugin/shared"
"github.com/maja42/goval"
"github.com/rs/zerolog/log"
"github.com/httprunner/funplugin"
"github.com/httprunner/funplugin/shared"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
)
func newParser() *Parser {

View File

@@ -10,7 +10,7 @@ import (
"github.com/httprunner/funplugin"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/hrp/internal/sdk"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk"
)
const (

View File

@@ -14,8 +14,8 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/hrp/internal/json"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/json"
)
var fieldTags = []string{"proto", "status_code", "headers", "cookies", "body", textExtractorSubRegexp}
@@ -268,7 +268,7 @@ func (v *responseObject) searchRegexp(expr string) interface{} {
}
match := regexpCompile.FindStringSubmatch(bodyStr)
if len(match) > 1 {
return match[1] //return first matched result in parentheses
return match[1] // return first matched result in parentheses
}
log.Error().Str("expr", expr).Msg("search regexp failed")
return expr

View File

@@ -14,7 +14,7 @@ import (
"github.com/rs/zerolog/log"
"golang.org/x/net/http2"
"github.com/httprunner/httprunner/hrp/internal/sdk"
"github.com/httprunner/httprunner/v4/hrp/internal/sdk"
)
// Run starts to run API test with default configs.

View File

@@ -8,8 +8,8 @@ import (
"github.com/rs/zerolog/log"
"github.com/stretchr/testify/assert"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/hrp/internal/scaffold"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/scaffold"
)
func buildHashicorpGoPlugin() {

View File

@@ -3,7 +3,7 @@ package hrp
import (
"fmt"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
)
// IAPI represents interface for api,

View File

@@ -20,9 +20,9 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/hrp/internal/httpstat"
"github.com/httprunner/httprunner/hrp/internal/json"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/httpstat"
"github.com/httprunner/httprunner/v4/hrp/internal/json"
)
type HTTPMethod string

View File

@@ -3,8 +3,9 @@ package hrp
import (
"time"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
)
type ThinkTime struct {

View File

@@ -3,15 +3,17 @@ package hrp
import (
"bytes"
"fmt"
"github.com/gorilla/websocket"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/hrp/internal/json"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"net/http"
"testing"
"time"
"unsafe"
"github.com/gorilla/websocket"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/json"
)
const (

View File

@@ -10,9 +10,10 @@ import (
"runtime"
"time"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/hrp/internal/version"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/version"
)
func newOutSummary() *Summary {
@@ -72,7 +73,7 @@ func (s *Summary) genHTMLReport() error {
}
reportPath := filepath.Join(reportsDir, fmt.Sprintf("report-%v.html", s.Time.StartAt.Unix()))
file, err := os.OpenFile(reportPath, os.O_WRONLY|os.O_CREATE, 0666)
file, err := os.OpenFile(reportPath, os.O_WRONLY|os.O_CREATE, 0o666)
if err != nil {
log.Error().Err(err).Msg("open file failed")
return err

View File

@@ -7,9 +7,10 @@ import (
"path/filepath"
"strings"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
)
// ITestCase represents interface for testcases,

View File

@@ -5,7 +5,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/httprunner/httprunner/hrp/internal/builtin"
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
)
const (
@@ -22,9 +22,7 @@ var (
demoAPIGETPath APIPath = templatesDir + "/api/get.yml"
)
var (
demoTestCaseWithThinkTimePath TestCasePath = hrpExamplesDir + "/think_time_test.json"
)
var demoTestCaseWithThinkTimePath TestCasePath = hrpExamplesDir + "/think_time_test.json"
var demoTestCaseWithPlugin = &TestCase{
Config: NewConfig("demo with complex mechanisms").

View File

@@ -3,7 +3,7 @@ package tests
import (
"testing"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/v4/hrp"
)
// reference extracted variables for validation in the same step

View File

@@ -3,7 +3,7 @@ package tests
import (
"testing"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/v4/hrp"
)
func TestCaseCallFunction(t *testing.T) {

View File

@@ -3,7 +3,7 @@ package tests
import (
"testing"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/v4/hrp"
)
func TestHTTPProtocol(t *testing.T) {

View File

@@ -3,7 +3,7 @@ package tests
import (
"testing"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/v4/hrp"
)
func TestRendezvous(t *testing.T) {

View File

@@ -3,7 +3,7 @@ package tests
import (
"testing"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/v4/hrp"
)
func TestCaseBasicRequest(t *testing.T) {

View File

@@ -3,7 +3,7 @@ package tests
import (
"testing"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/v4/hrp"
)
func TestCaseValidateStep(t *testing.T) {

View File

@@ -3,7 +3,7 @@ package tests
import (
"testing"
"github.com/httprunner/httprunner/hrp"
"github.com/httprunner/httprunner/v4/hrp"
)
func TestCaseConfigVariables(t *testing.T) {