Merge pull request #8 from qa-dev/QA-5454

QA-5454: fix

Author: podtserkovskiy

jsonwire/interfaces.go

@@ -5,7 +5,7 @@ type ClientFactoryInterface interface {
 }
 
 type ClientInterface interface {
-	Status() (*Message, error)
+	Health() (*Message, error)
 	Sessions() (*Sessions, error)
 	CloseSession(sessionID string) (*Message, error)
 	Address() string

jsonwire/mocks.go

@@ -17,7 +17,7 @@ type ClientMock struct {
 	mock.Mock
 }
 
-func (c *ClientMock) Status() (*Message, error) {
+func (c *ClientMock) Health() (*Message, error) {
 	args := c.Called()
 	return args.Get(0).(*Message), args.Error(1)
 }

pool/strategy/kubernetes/provider.go

@@ -63,7 +63,7 @@ Loop:
 		default:
 			time.Sleep(time.Second)
 			log.Debugln("start request")
-			message, err := client.Status()
+			message, err := client.Health()
 			if err != nil {
 				log.Debugf("fail request, %v", err)
 				continue

pool/strategy/persistent/strategy.go

@@ -43,7 +43,7 @@ func (s *Strategy) Reserve(desiredCaps capabilities.Capabilities) (pool.Node, er
 			break
 		}
 		client := s.clientFactory.Create(node.Address)
-		message, err := client.Status()
+		message, err := client.Health()
 		if err != nil {
 			log.Infof("Remove unavailable node [%s], %s", node, err)
 			err = s.storage.Remove(node)

pool/strategy/persistent/strategy_test.go

@@ -40,7 +40,7 @@ func TestStrategy_Reserve_Positive(t *testing.T) {
 	clm := new(jsonwire.ClientMock)
 	cfm.On("Create", mock.AnythingOfType("string")).Return(clm)
 	message := new(jsonwire.Message)
-	clm.On("Status").Return(message, nil)
+	clm.On("Health").Return(message, nil)
 	srm := new(sessionsRemoverMock)
 	srm.On("removeAllSessions").Return(0, nil)
 	srfm := &sessionsRemoverMockFactory{srm}
@@ -91,7 +91,7 @@ func TestStrategy_Reserve_Negative_Client_Status_Error(t *testing.T) {
 	clm := new(jsonwire.ClientMock)
 	cfm.On("Create", mock.AnythingOfType("string")).Return(clm)
 	eError := errors.New("Error")
-	clm.On("Status").Return(nil, eError)
+	clm.On("Health").Return(nil, eError)
 	s := Strategy{storage: sm, capsComparator: cm, clientFactory: cfm}
 	_, err := s.Reserve(capabilities.Capabilities{})
 	assert.NotNil(t, err)
@@ -109,7 +109,7 @@ func TestStrategy_Reserve_Negative_Client_Status_NotOk(t *testing.T) {
 	cfm.On("Create", mock.AnythingOfType("string")).Return(clm)
 	message := new(jsonwire.Message)
 	message.Status = -99
-	clm.On("Status").Return(message, nil)
+	clm.On("Health").Return(message, nil)
 	s := Strategy{storage: sm, capsComparator: cm, clientFactory: cfm}
 	_, err := s.Reserve(capabilities.Capabilities{})
 	assert.NotNil(t, err)
@@ -126,7 +126,7 @@ func TestStrategy_Reserve_Negative_removeAllSessions_Error(t *testing.T) {
 	clm := new(jsonwire.ClientMock)
 	cfm.On("Create", mock.AnythingOfType("string")).Return(clm)
 	message := new(jsonwire.Message)
-	clm.On("Status").Return(message, nil)
+	clm.On("Health").Return(message, nil)
 	eError := errors.New("Error")
 	srm := new(sessionsRemoverMock)
 	srm.On("removeAllSessions").Return(0, eError)

selenium/client.go

@@ -53,7 +53,7 @@ func (c *Client) Sessions() (*jsonwire.Sessions, error) {
 	return &sessions, err
 }
 
-func (c *Client) Status() (*jsonwire.Message, error) {
+func (c *Client) Health() (*jsonwire.Message, error) {
 	reqURL := url.URL{
 		Scheme: PROTOCOL,
 		Path:   "/wd/hub/status",

wda/client.go

@@ -40,10 +40,10 @@ func (c *Client) Sessions() (*jsonwire.Sessions, error) {
 	return &sessions, nil
 }
 
-func (c *Client) Status() (*jsonwire.Message, error) {
+func (c *Client) Health() (*jsonwire.Message, error) {
 	reqURL := url.URL{
 		Scheme: PROTOCOL,
-		Path:   "/status",
+		Path:   "/health",
 		Host:   c.Address(),
 	}
 	request, err := newRequest(http.MethodGet, reqURL.String(), "")