#117 - fix data races

.travis.sh

@@ -1,8 +1,40 @@
 #!/bin/sh
 set -e
-docker pull golang:1.10-alpine
-docker run \
-    --rm \
-    -v $(pwd):/go/src/github.com/mkenney/go-chrome \
-    --entrypoint="/go/src/github.com/mkenney/go-chrome/.travis.entrypoint.sh" \
-    golang:1.10-alpine
+
+exit_code=0
+
+go get -v github.com/golang/lint/golint
+[ "0" = "$?" ] || exit 1
+
+go get -u github.com/golang/dep/cmd/dep
+[ "0" = "$?" ] || exit 2
+
+dep ensure
+[ "0" = "$?" ] || exit 3
+
+for dir in $(go list ./... | grep -v vendor); do
+    echo "golint $dir"
+    result=$(golint $dir)
+    if [ "" != "$result" ]; then
+        echo $result
+        exit_code=5
+    fi
+    if [ "0" != "$exit_code" ]; then
+        exit $exit_code
+    fi
+done
+
+rm -f coverage.txt
+for dir in $(go list ./... | grep -v vendor); do
+    GOCACHE=off go test -race -timeout 300s -coverprofile=profile.out $dir
+    exit_code=$?
+    if [ "0" != "$exit_code" ]; then
+        exit $exit_code
+    fi
+    if [ -f profile.out ]; then
+        cat profile.out >> coverage.txt
+        rm profile.out
+    fi
+done
+
+exit $exit_code

.travis.yml

@@ -11,14 +11,12 @@ branches:
     only:
         - master
 
-services:
-    - docker
-
 language: go
 go_import_path: github.com/mkenney/go-chrome
 go:
     - 1.9.x
     - 1.10.x
+    - 1.11.x
     - tip
 
 

docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3.5'
+services:
+    chrome:
+        container_name: chrome
+        hostname: chrome
+        image: mkenney/chromium-headless:latest
+        ports:
+            - 9222:9222
+        entrypoint: sh
+        command:
+            - "-cexu"
+            - "/usr/bin/google-chrome --addr=localhost --port=9222 --remote-debugging-port=9222 --remote-debugging-address=0.0.0.0 --disable-extensions --disable-gpu --headless --hide-scrollbars --no-first-run --no-sandbox"

tot/chrome.chromium.go

@@ -299,7 +299,7 @@ func (chrome *Chrome) Query(
 	log.WithFields(log.Fields{
 		"path":   path,
 		"status": resp.Status,
-	}).Debug("querying chrome:/%s %s", path, resp.Status)
+	}).Debug("querying chrome")
 	if 200 != resp.StatusCode {
 		return nil, errs.New(0, resp.Status)
 	}

tot/mock.chromium_test.go

@@ -233,7 +233,7 @@ func (chrome *MockChrome) Query(
 	if len(params) > 0 {
 		path += fmt.Sprintf("?%s", params.Encode())
 	}
-	log.Debugf("chrome:/%s %s", path)
+	log.Debugf("chrome:/%s", path)
 	return msg, nil
 }
 

tot/socket/cdtp.accessibility_test.go

@@ -2,32 +2,27 @@ package socket
 
 import (
 	"encoding/json"
-	"net/url"
 	"testing"
 
 	"github.com/mkenney/go-chrome/tot/accessibility"
 	"github.com/mkenney/go-chrome/tot/dom"
 )
 
 func TestAccessibilityGetPartialAXTree(t *testing.T) {
-	socketURL, _ := url.Parse("https://test:9222/TestAccessibilityGetPartialAXTree")
-	mockSocket := NewMock(socketURL)
-	mockSocket.Listen()
-	defer mockSocket.Stop()
+	chrome := NewMockChrome()
+	chrome.ListenAndServe()
+	defer func() { chrome.Close() }()
+	soc := New(chrome.URL)
+	defer func() { soc.Stop() }()
 
 	params := &accessibility.PartialAXTreeParams{
 		NodeID:         dom.NodeID(1),
 		FetchRelatives: true,
 	}
-	resultChan := mockSocket.Accessibility().GetPartialAXTree(params)
-	mockResult := accessibility.PartialAXTreeResult{}
-	mockResultBytes, _ := json.Marshal(mockResult)
-	mockSocket.Conn().(*MockChromeWebSocket).AddMockData(&Response{
-		ID:     mockSocket.CurCommandID(),
-		Error:  &Error{},
-		Result: mockResultBytes,
-	})
-	result := <-resultChan
+	mockResult := &accessibility.PartialAXTreeResult{}
+
+	chrome.AddData(MockData{0, &Error{}, mockResult, ""})
+	result := <-soc.Accessibility().GetPartialAXTree(params)
 	if nil != result.Err {
 		t.Errorf("Expected success, got error: %s", result.Err)
 	}
@@ -36,8 +31,7 @@ func TestAccessibilityGetPartialAXTree(t *testing.T) {
 		t.Errorf("Expected empty set, got '%s'", tmp)
 	}
 
-	resultChan = mockSocket.Accessibility().GetPartialAXTree(params)
-	mockResult = accessibility.PartialAXTreeResult{
+	mockResult = &accessibility.PartialAXTreeResult{
 		Nodes: []*accessibility.AXNode{{
 			NodeID:  accessibility.AXNodeID("NodeID"),
 			Ignored: false,
@@ -73,13 +67,8 @@ func TestAccessibilityGetPartialAXTree(t *testing.T) {
 			BackendDOMNodeID: dom.BackendNodeID(1),
 		}},
 	}
-	mockResultBytes, _ = json.Marshal(mockResult)
-	mockSocket.Conn().(*MockChromeWebSocket).AddMockData(&Response{
-		ID:     mockSocket.CurCommandID(),
-		Error:  &Error{},
-		Result: mockResultBytes,
-	})
-	result = <-resultChan
+	chrome.AddData(MockData{0, &Error{}, mockResult, ""})
+	result = <-soc.Accessibility().GetPartialAXTree(params)
 	if nil != result.Err {
 		t.Errorf("Expected success, got error: %s", result.Err)
 	}
@@ -88,16 +77,8 @@ func TestAccessibilityGetPartialAXTree(t *testing.T) {
 		t.Errorf("Expected dataset, got '%s'", tmp)
 	}
 
-	resultChan = mockSocket.Accessibility().GetPartialAXTree(params)
-	mockSocket.Conn().(*MockChromeWebSocket).AddMockData(&Response{
-		ID: mockSocket.CurCommandID(),
-		Error: &Error{
-			Code:    1,
-			Data:    []byte(`"error data"`),
-			Message: "error message",
-		},
-	})
-	result = <-resultChan
+	chrome.AddData(MockData{0, genericError, nil, ""})
+	result = <-soc.Accessibility().GetPartialAXTree(params)
 	if nil == result.Err {
 		t.Errorf("Expected error, got success")
 	}