Various fixes, updating Makefile to support all test variants

Author: ewoutp

Makefile

@@ -23,6 +23,44 @@ REPOPATH := $(ORGPATH)/$(REPONAME)
 
 SOURCES := $(shell find . -name '*.go')
 
+# Test variables
+
+DBCONTAINER := $(PROJECT)-test-db
+TESTCONTAINER := $(PROJECT)-test
+
+ifeq ("$(TEST_AUTH)", "none")
+	ARANGOENV := -e ARANGO_NO_AUTH=1
+	TEST_AUTHENTICATION := 
+	TAGS := 
+	TESTS := $(REPOPATH) $(REPOPATH)/test
+else ifeq ("$(TEST_AUTH)", "rootpw")
+	ARANGOENV := -e ARANGO_ROOT_PASSWORD=rootpw
+	TEST_AUTHENTICATION := basic:root:rootpw
+	TAGS := -tags auth
+	TESTS := $(REPOPATH)/test
+endif
+
+ifeq ("$(TEST_MODE)", "single")
+	TEST_NET := container:$(DBCONTAINER)
+	TEST_ENDPOINTS := http://localhost:8529
+else 
+	TEST_NET := host
+	TEST_ENDPOINTS := http://localhost:7002
+ifeq ("$(TEST_AUTH)", "rootpw")
+	CLUSTERENV := JWTSECRET=testing
+	TEST_AUTHENTICATION := basic:root:
+endif
+ifeq ("$(TEST_SSL)", "auto")
+	CLUSTERENV := SSL=auto $(CLUSTERENV)
+	TEST_ENDPOINTS = https://localhost:7002
+endif
+endif
+
+ifeq ("$(TEST_BENCHMARK)", "true")
+	TAGS := -bench=. -run=notests -cpu=1,2,4
+	TESTS := $(REPOPATH)/test
+endif
+
 .PHONY: all build clean run-tests
 
 all: build
@@ -38,9 +76,6 @@ $(GOBUILDDIR):
 	@rm -f $(REPODIR) && ln -s ../../../.. $(REPODIR)
 	GOPATH=$(GOBUILDDIR) go get github.com/arangodb/go-velocypack
 
-DBCONTAINER := $(PROJECT)-test-db
-TESTCONTAINER := $(PROJECT)-test
-
 run-tests: run-tests-http run-tests-single run-tests-cluster
 
 # Tests of HTTP package 
@@ -54,93 +89,95 @@ run-tests-http: $(GOBUILDDIR)
 		go test $(TESTOPTIONS) $(REPOPATH)/http
 
 # Single server tests 
-run-tests-single: run-tests-single-with-auth run-tests-single-no-auth
+run-tests-single: run-tests-single-json run-tests-single-vpack
 
-run-tests-single-no-auth: $(GOBUILDDIR)
-	@echo "Single server, no authentication"
-	@-docker rm -f -v $(DBCONTAINER) $(TESTCONTAINER) &> /dev/null
-	@docker run -d --name $(DBCONTAINER) \
-		-e ARANGO_NO_AUTH=1 \
-		$(ARANGODB)
-	@docker run \
-		--name=$(TESTCONTAINER) \
-		--net=container:$(DBCONTAINER) \
-		-v $(ROOTDIR):/usr/code \
-		-e GOPATH=/usr/code/.gobuild \
-		-e TEST_ENDPOINTS=http://localhost:8529 \
-		-w /usr/code/ \
-		golang:$(GOVERSION) \
-		go test $(TESTOPTIONS) $(REPOPATH) $(REPOPATH)/test
-	@docker rm -f -v $(TESTCONTAINER) &> /dev/null
-	@docker rm -f -v $(DBCONTAINER) &> /dev/null
-	@sleep 3
+run-tests-single-json: run-tests-single-json-with-auth run-tests-single-json-no-auth
 
-run-tests-single-with-auth: $(GOBUILDDIR)
-	@echo "Single server, with authentication"
-	@-docker rm -f -v $(DBCONTAINER) $(TESTCONTAINER) &> /dev/null
-	@docker run -d --name $(DBCONTAINER) \
-		-e ARANGO_ROOT_PASSWORD=rootpw \
-		$(ARANGODB)
-	@docker run \
-		--name=$(TESTCONTAINER) \
-		--net=container:$(DBCONTAINER) \
-		-v $(ROOTDIR):/usr/code \
-		-e GOPATH=/usr/code/.gobuild \
-		-e TEST_ENDPOINTS=http://localhost:8529 \
-		-e TEST_AUTHENTICATION=basic:root:rootpw \
-		-w /usr/code/ \
-		golang:$(GOVERSION) \
-		go test -tags auth $(TESTOPTIONS) $(REPOPATH)/test
-	@docker rm -f -v $(TESTCONTAINER) &> /dev/null
-	@docker rm -f -v $(DBCONTAINER) &> /dev/null
-	@sleep 3
+run-tests-single-vpack: run-tests-single-vpack-with-auth run-tests-single-vpack-no-auth
+
+run-tests-single-json-no-auth:
+	@echo "Single server, HTTP+JSON, no authentication"
+	@${MAKE} TEST_MODE="single" TEST_AUTH="none" TEST_CONTENT_TYPE="json" __run_tests
+
+run-tests-single-vpack-no-auth:
+	@echo "Single server, HTTP+Velocypack, no authentication"
+	@${MAKE} TEST_MODE="single" TEST_AUTH="none" TEST_CONTENT_TYPE="vpack" __run_tests
+
+run-tests-single-json-with-auth:
+	@echo "Single server, HTTP+JSON, with authentication"
+	@${MAKE} TEST_MODE="single" TEST_AUTH="rootpw" TEST_CONTENT_TYPE="json" __run_tests
+
+run-tests-single-vpack-with-auth:
+	@echo "Single server, HTTP+Velocypack, with authentication"
+	@${MAKE} TEST_MODE="single" TEST_AUTH="rootpw" TEST_CONTENT_TYPE="vpack" __run_tests
 
 # Cluster mode tests
-run-tests-cluster: run-tests-cluster-no-auth run-tests-cluster-with-auth run-tests-cluster-ssl
+run-tests-cluster: run-tests-cluster-json run-tests-cluster-vpack
 
-run-tests-cluster-no-auth: $(GOBUILDDIR)
-	@echo "Cluster server, no authentication"
-	@PROJECT=$(PROJECT) ARANGODB=$(ARANGODB) $(ROOTDIR)/test/cluster.sh start
-	docker run \
-		--rm \
-		--net=host \
-		-v $(ROOTDIR):/usr/code \
-		-e GOPATH=/usr/code/.gobuild \
-		-e TEST_ENDPOINTS=http://localhost:7002 \
-		-w /usr/code/ \
-		golang:$(GOVERSION) \
-		go test $(TESTOPTIONS) $(REPOPATH)/test
-	@PROJECT=$(PROJECT) ARANGODB=$(ARANGODB) $(ROOTDIR)/test/cluster.sh cleanup
+run-tests-cluster-json: run-tests-cluster-json-no-auth run-tests-cluster-json-with-auth run-tests-cluster-json-ssl
+
+run-tests-cluster-vpack: run-tests-cluster-vpack-no-auth run-tests-cluster-vpack-with-auth run-tests-cluster-vpack-ssl
+
+run-tests-cluster-json-no-auth: $(GOBUILDDIR)
+	@echo "Cluster server, JSON, no authentication"
+	@${MAKE} TEST_MODE="cluster" TEST_AUTH="none" TEST_CONTENT_TYPE="json" __run_tests
 
-run-tests-cluster-with-auth: $(GOBUILDDIR)
+run-tests-cluster-vpack-no-auth: $(GOBUILDDIR)
+	@echo "Cluster server, Velocpack, no authentication"
+	@${MAKE} TEST_MODE="cluster" TEST_AUTH="none" TEST_CONTENT_TYPE="vpack" __run_tests
+
+run-tests-cluster-json-with-auth: $(GOBUILDDIR)
 	@echo "Cluster server, with authentication"
-	@PROJECT=$(PROJECT) ARANGODB=$(ARANGODB) TMPDIR=${GOBUILDDIR} JWTSECRET=testing $(ROOTDIR)/test/cluster.sh start
-	docker run \
-		--rm \
-		--net=host \
-		-v $(ROOTDIR):/usr/code \
-		-e GOPATH=/usr/code/.gobuild \
-		-e TEST_ENDPOINTS=http://localhost:7002 \
-		-e TEST_AUTHENTICATION=basic:root: \
-		-w /usr/code/ \
-		golang:$(GOVERSION) \
-		go test -tags auth $(TESTOPTIONS) $(REPOPATH)/test
-	@PROJECT=$(PROJECT) ARANGODB=$(ARANGODB) $(ROOTDIR)/test/cluster.sh cleanup
+	@${MAKE} TEST_MODE="cluster" TEST_AUTH="rootpw" TEST_CONTENT_TYPE="json" __run_tests
+
+run-tests-cluster-vpack-with-auth: $(GOBUILDDIR)
+	@echo "Cluster server, Velocypack, with authentication"
+	@${MAKE} TEST_MODE="cluster" TEST_AUTH="rootpw" TEST_CONTENT_TYPE="vpack" __run_tests
 
-run-tests-cluster-ssl: $(GOBUILDDIR)
+run-tests-cluster-json-ssl: $(GOBUILDDIR)
 	@echo "Cluster server, SSL, with authentication"
-	@PROJECT=$(PROJECT) ARANGODB=$(ARANGODB) SSL=auto TMPDIR=${GOBUILDDIR} JWTSECRET=testing $(ROOTDIR)/test/cluster.sh start
+	@${MAKE} TEST_MODE="cluster" TEST_AUTH="rootpw" TEST_SSL="auto" TEST_CONTENT_TYPE="json" __run_tests
+
+run-tests-cluster-vpack-ssl: $(GOBUILDDIR)
+	@echo "Cluster server, Velocypack, SSL, with authentication"
+	@${MAKE} TEST_MODE="cluster" TEST_AUTH="rootpw" TEST_SSL="auto" TEST_CONTENT_TYPE="vpack" __run_tests
+
+# Internal test tasks
+__run_tests: $(GOBUILDDIR) __test_prepare __test_go_test __test_cleanup
+
+__test_go_test:
 	docker run \
-		--rm \
-		--net=host \
+		--name=$(TESTCONTAINER) \
+		--net=$(TEST_NET) \
 		-v $(ROOTDIR):/usr/code \
 		-e GOPATH=/usr/code/.gobuild \
-		-e TEST_ENDPOINTS=https://localhost:7002 \
-		-e TEST_AUTHENTICATION=basic:root: \
+		-e TEST_ENDPOINTS=$(TEST_ENDPOINTS) \
+		-e TEST_AUTHENTICATION=$(TEST_AUTHENTICATION) \
+		-e TEST_CONTENT_TYPE=$(TEST_CONTENT_TYPE) \
 		-w /usr/code/ \
 		golang:$(GOVERSION) \
-		go test -tags auth $(TESTOPTIONS) $(REPOPATH)/test
+		go test $(TAGS) $(TESTOPTIONS) $(TESTS)
+
+__test_prepare:
+ifeq ("$(TEST_MODE)", "single")
+	@-docker rm -f -v $(DBCONTAINER) $(TESTCONTAINER) &> /dev/null
+	docker run -d --name $(DBCONTAINER) \
+		$(ARANGOENV) \
+		$(ARANGODB)
+else
+	@-docker rm -f -v $(TESTCONTAINER) &> /dev/null
+	@PROJECT=$(PROJECT) ARANGODB=$(ARANGODB) TMPDIR=${GOBUILDDIR} $(CLUSTERENV) $(ROOTDIR)/test/cluster.sh start
+endif
+
+__test_cleanup:
+	@docker rm -f -v $(TESTCONTAINER) &> /dev/null
+ifeq ("$(TEST_MODE)", "single")
+	@docker rm -f -v $(DBCONTAINER) &> /dev/null
+else
 	@PROJECT=$(PROJECT) ARANGODB=$(ARANGODB) $(ROOTDIR)/test/cluster.sh cleanup
+endif
+	@sleep 3
+
 
 run-tests-cluster-failover: $(GOBUILDDIR)
 	# Note that we use 127.0.0.1:7002.. as endpoints, so we force using IPv4
@@ -165,21 +202,10 @@ run-tests-cluster-cleanup:
 	@PROJECT=$(PROJECT) ARANGODB=$(ARANGODB) $(ROOTDIR)/test/cluster.sh cleanup
 
 # Benchmarks
-run-benchmarks-single-no-auth: $(GOBUILDDIR)
-	@echo "Single server, no authentication"
-	@-docker rm -f -v $(DBCONTAINER) $(TESTCONTAINER) &> /dev/null
-	@docker run -d --name $(DBCONTAINER) \
-		-e ARANGO_NO_AUTH=1 \
-		$(ARANGODB)
-	@docker run \
-		--name=$(TESTCONTAINER) \
-		--net=container:$(DBCONTAINER) \
-		-v $(ROOTDIR):/usr/code \
-		-e GOPATH=/usr/code/.gobuild \
-		-e TEST_ENDPOINTS=http://localhost:8529 \
-		-w /usr/code/ \
-		golang:$(GOVERSION) \
-		go test $(TESTOPTIONS) -bench=. -run=notests -cpu=1,2,4 $(REPOPATH)/test
-	@docker rm -f -v $(TESTCONTAINER) &> /dev/null
-	@docker rm -f -v $(DBCONTAINER) &> /dev/null
-	@sleep 3
+run-benchmarks-single-json-no-auth: 
+	@echo "Benchmarks: Single server, JSON no authentication"
+	@${MAKE} TEST_MODE="single" TEST_AUTH="none" TEST_CONTENT_TYPE="json" TEST_BENCHMARK="true" __run_tests
+
+run-benchmarks-single-vpack-no-auth: 
+	@echo "Benchmarks: Single server, Velocypack, no authentication"
+	@${MAKE} TEST_MODE="single" TEST_AUTH="none" TEST_CONTENT_TYPE="vpack" TEST_BENCHMARK="true" __run_tests

http/content_type.go content_type.gohttp/content_type.go renamed to content_type.go

@@ -20,7 +20,7 @@
 // Author Ewout Prangsma
 //
 
-package http
+package driver
 
 import "fmt"
 

http/connection.go

@@ -59,7 +59,7 @@ type ConnectionConfig struct {
 	// Cluster configuration settings
 	cluster.ConnectionConfig
 	// ContentType specified type of content encoding to use.
-	ContentType ContentType
+	ContentType driver.ContentType
 }
 
 // NewConnection creates a new HTTP connection based on the given configuration settings.
@@ -107,7 +107,7 @@ func newHTTPConnection(endpoint string, config ConnectionConfig) (driver.Connect
 // httpConnection implements an HTTP + JSON connection to an arangodb server.
 type httpConnection struct {
 	endpoint    url.URL
-	contentType ContentType
+	contentType driver.ContentType
 	client      *http.Client
 }
 
@@ -125,17 +125,17 @@ func (c *httpConnection) NewRequest(method, path string) (driver.Request, error)
 		return nil, driver.WithStack(driver.InvalidArgumentError{Message: fmt.Sprintf("Invalid method '%s'", method)})
 	}
 	ct := c.contentType
-	if strings.Contains(path, "gharial") || strings.Contains(path, "import") {
-		ct = ContentTypeJSON
+	if strings.Contains(path, "gharial") /*|| strings.Contains(path, "import")*/ {
+		ct = driver.ContentTypeJSON
 	}
 	switch ct {
-	case ContentTypeJSON:
+	case driver.ContentTypeJSON:
 		r := &httpJSONRequest{
 			method: method,
 			path:   path,
 		}
 		return r, nil
-	case ContentTypeVelocypack:
+	case driver.ContentTypeVelocypack:
 		r := &httpVPackRequest{
 			method: method,
 			path:   path,
@@ -202,15 +202,19 @@ func (c *httpConnection) Do(ctx context.Context, req driver.Request) (driver.Res
 // Unmarshal unmarshals the given raw object into the given result interface.
 func (c *httpConnection) Unmarshal(data driver.RawObject, result interface{}) error {
 	ct := c.contentType
-	if len(data) >= 2 && data[0] == '{' && data[len(data)-1] == '}' {
-		ct = ContentTypeJSON
+	if ct == driver.ContentTypeVelocypack && len(data) >= 2 {
+		// Poor mans auto detection of json
+		l := len(data)
+		if (data[0] == '{' && data[l-1] == '}') || (data[0] == '[' && data[l-1] == ']') {
+			ct = driver.ContentTypeJSON
+		}
 	}
 	switch ct {
-	case ContentTypeJSON:
+	case driver.ContentTypeJSON:
 		if err := json.Unmarshal(data, result); err != nil {
 			return driver.WithStack(err)
 		}
-	case ContentTypeVelocypack:
+	case driver.ContentTypeVelocypack:
 		//panic(velocypack.Slice(data))
 		if err := velocypack.Unmarshal(velocypack.Slice(data), result); err != nil {
 			return driver.WithStack(err)

http/request_vpack.go

@@ -133,21 +133,13 @@ func (r *httpVPackRequest) SetBodyImportArray(bodyArray interface{}) (driver.Req
 		return nil, driver.WithStack(driver.InvalidArgumentError{Message: fmt.Sprintf("bodyArray must be slice, got %s", bodyArrayVal.Kind())})
 	}
 	// Render elements
-	elementCount := bodyArrayVal.Len()
 	buf := &bytes.Buffer{}
 	encoder := velocypack.NewEncoder(buf)
-	for i := 0; i < elementCount; i++ {
-		entryVal := bodyArrayVal.Index(i)
-		if isNil(entryVal) {
-			buf.Write(velocypack.NullSlice())
-			//buf.WriteString("\n")
-		} else {
-			if err := encoder.Encode(entryVal.Interface()); err != nil {
-				return nil, driver.WithStack(err)
-			}
-		}
+	if err := encoder.Encode(bodyArray); err != nil {
+		return nil, driver.WithStack(err)
 	}
 	r.body = buf.Bytes()
+	r.SetQuery("type", "list")
 	return r, nil
 }
 

test/client_test.go

@@ -62,6 +62,20 @@ func getEndpointsFromEnv(t testEnv) []string {
 	return eps
 }
 
+// getContentTypeFromEnv returns the content-type specified in the TEST_CONTENT_TYPE
+// environment variable (json|vpack).
+func getContentTypeFromEnv(t testEnv) driver.ContentType {
+	switch ct := os.Getenv("TEST_CONTENT_TYPE"); ct {
+	case "vpack":
+		return driver.ContentTypeVelocypack
+	case "json", "":
+		return driver.ContentTypeJSON
+	default:
+		t.Fatalf("Unknown content type '%s'", ct)
+		return 0
+	}
+}
+
 // createAuthenticationFromEnv initializes an authentication specified in the TEST_AUTHENTICATION
 // environment variable.
 func createAuthenticationFromEnv(t testEnv) driver.Authentication {
@@ -92,7 +106,7 @@ func createConnectionFromEnv(t testEnv) driver.Connection {
 	config := http.ConnectionConfig{
 		Endpoints:   getEndpointsFromEnv(t),
 		TLSConfig:   &tls.Config{InsecureSkipVerify: true},
-		ContentType: http.ContentTypeVelocypack,
+		ContentType: getContentTypeFromEnv(t),
 	}
 	conn, err := http.NewConnection(config)
 	if err != nil {
@@ -146,7 +160,7 @@ func waitUntilServerAvailable(ctx context.Context, c driver.Client, t testEnv) b
 				return
 			} else {
 				cancel()
-				t.Logf("Version failed: %s %#v", describe(err), err)
+				//t.Logf("Version failed: %s %#v", describe(err), err)
 				time.Sleep(time.Second)
 			}
 		}