Merge pull request #11 from qa-dev/benchmark

benchmark fixes

Author: makhov

config/config.go

@@ -18,9 +18,9 @@ type Grid struct {
 	ClientType       string     `json:"client_type"`
 	Port             int        `json:"port"`
 	StrategyList     []Strategy `json:"strategy_list"`
-	BusyNodeDuration string     `json:"busy_node_duration"`     // duration string format ex. 12m, see time.ParseDuration()
+	BusyNodeDuration string     `json:"busy_node_duration"` // duration string format ex. 12m, see time.ParseDuration()
 	// todo: выпилить и сделать равным дедлайну http запроса
-	ReservedDuration string     `json:"reserved_node_duration"` // duration string format ex. 12m, see time.ParseDuration()
+	ReservedDuration string `json:"reserved_node_duration"` // duration string format ex. 12m, see time.ParseDuration()
 }
 
 type Strategy struct {

handlers/createSession.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
 	log "github.com/Sirupsen/logrus"
 	"github.com/qa-dev/jsonwire-grid/jsonwire"
 	"github.com/qa-dev/jsonwire-grid/pool"
@@ -13,7 +14,6 @@ import (
 	"net/http"
 	"net/http/httputil"
 	"net/url"
-	"fmt"
 )
 
 type CreateSession struct {

jsonwire/jsonwire.go

@@ -26,27 +26,28 @@ type Sessions struct {
 }
 
 type Register struct {
-	Class            string         `json:"class"`
-	Configuration    *Configuration `json:"configuration"`
-	CapabilitiesList []Capabilities `json:"capabilities"` // selenium 3
+	Class            string         `json:"class,omitempty"`
+	Configuration    *Configuration `json:"configuration,omitempty"`
+	CapabilitiesList []Capabilities `json:"capabilities,omitempty"` // selenium 3
 }
 
 type Capabilities map[string]interface{}
 
 type Configuration struct {
-	Proxy            string
-	Role             string
-	Hub              string
-	Port             int
-	RemoteHost       string
-	Host             string
-	MaxSession       int
-	HubHost          string
-	RegisterCycle    int
-	HubPort          int
-	URL              string
-	Register         bool
-	CapabilitiesList []Capabilities `json:"capabilities"` // selenium 2
+	Id               string         `json:"id,omitempty"`
+	Proxy            string         `json:"proxy,omitempty"`
+	Role             string         `json:"role,omitempty"`
+	Hub              string         `json:"hub,omitempty"`
+	Port             int            `json:"port,omitempty"`
+	RemoteHost       string         `json:"remoteHost,omitempty"`
+	Host             string         `json:"host,omitempty"`
+	MaxSession       int            `json:"maxSession,omitempty"`
+	HubHost          string         `json:"hubHost,omitempty"`
+	RegisterCycle    int            `json:"registerCycle,omitempty"`
+	HubPort          int            `json:"hubPort,omitempty"`
+	URL              string         `json:"url,omitempty"`
+	Register         bool           `json:"register,omitempty"`
+	CapabilitiesList []Capabilities `json:"capabilities,omitempty"` // selenium 2
 }
 
 type APIProxy struct {

logger/logger.go

@@ -3,8 +3,8 @@ package logger
 import (
 	"github.com/Sirupsen/logrus"
 
-	"github.com/qa-dev/jsonwire-grid/config"
 	"fmt"
+	"github.com/qa-dev/jsonwire-grid/config"
 )
 
 func Init(logger config.Logger) error {

proxy/transport.go

@@ -27,7 +27,7 @@ func NewCreateSessionTransport(pool *pool.Pool, node *pool.Node) *CreateSessionT
 
 func (t *CreateSessionTransport) RoundTrip(request *http.Request) (*http.Response, error) {
 	var err error
-	defer func() {t.Error = err}() // dirty hack, for get error from round trip
+	defer func() { t.Error = err }() // dirty hack, for get error from round trip
 	response, err := http.DefaultTransport.RoundTrip(request)
 	if err != nil {
 		return nil, errors.New("round trip to node: " + err.Error())

testing/webdriver-node-mock/handlers.go

@@ -51,6 +51,7 @@ func createSession(rw http.ResponseWriter, r *http.Request) {
 		time.Sleep(time.Millisecond * time.Duration(rand.Intn(maxDuration)))
 	}
 	rw.Header().Set("Accept", "application/json")
+	rw.Header().Set("Content-type", "application/json; charset=utf-8")
 	rw.Header().Set("Accept-charset", "utf-8")
 
 	if r.Method != http.MethodPost {
@@ -106,10 +107,21 @@ func useSession(rw http.ResponseWriter, r *http.Request) {
 		responseMessage.Value = errorMassage
 	case parsedUrl[2] == "" && r.Method == http.MethodDelete: // session closed by client
 		currentSessionID = ""
+	default:
+		responseMessage.Value = RandStringRunes(10000)
 	}
-
 	err := json.NewEncoder(rw).Encode(responseMessage)
 	if err != nil {
 		http.Error(rw, "Error encode response to json, rawMessage: "+fmt.Sprintf("%+v", responseMessage), http.StatusInternalServerError)
 	}
 }
+
+var letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
+
+func RandStringRunes(n int) string {
+	b := make([]rune, n)
+	for i := range b {
+		b[i] = letterRunes[rand.Intn(len(letterRunes))]
+	}
+	return string(b)
+}

testing/webdriver-node-mock/webdriver-node-mock.go

@@ -16,7 +16,7 @@ import (
 	"time"
 )
 
-var currentSessionID, host, hubUrl string
+var currentSessionID, host, hubUrl, id string
 var maxDuration, port int
 
 func main() {
@@ -38,6 +38,7 @@ func main() {
 	log.Infof("port: %v", port)
 	log.Infof("maxDuration: %v", maxDuration)
 
+	id = "http://" + host + ":" + strconv.Itoa(port)
 	register()
 
 	go func() {
@@ -82,8 +83,11 @@ func getIpv4() (string, error) {
 func register() {
 	log.Info("Try register")
 	register := jsonwire.Register{
-		Configuration:    &jsonwire.Configuration{Host: host, Port: port},
-		CapabilitiesList: []jsonwire.Capabilities{{"browserName": "firefox"}},
+		Configuration: &jsonwire.Configuration{
+			Id:               id,
+			Host:             host,
+			Port:             port,
+			CapabilitiesList: []jsonwire.Capabilities{{"browserName": "firefox"}}},
 	}
 	b, err := json.Marshal(register)
 	if err != nil {
@@ -130,8 +134,8 @@ func register() {
 
 // sendApiProxy check "is server know me" and register if server return false
 func sendApiProxy() error {
-	b := strings.NewReader("{}")
-	req, err := http.NewRequest(http.MethodPost, hubUrl+"/grid/api/proxy?id=http://"+host+":"+strconv.Itoa(port), b)
+	b := strings.NewReader(`{id:"` + id + `"}`)
+	req, err := http.NewRequest(http.MethodPost, hubUrl+"/grid/api/proxy?id="+id, b)
 	if err != nil {
 		return fmt.Errorf("create request error, %s", err)
 	}
@@ -163,6 +167,7 @@ func sendApiProxy() error {
 	}
 	if !respStruct.Success {
 		log.Info("Node not registered on hub")
+		log.Info(string(respBytes))
 		register()
 	}
 	return nil