Merge branch 'master' into bugfix/start-string-slice-fix

Author: ewoutp

.travis.yml

@@ -6,21 +6,15 @@ services:
 language: go
 
 env:
-  - TEST_SUITE=run-tests-local-process ARANGODB=arangodb:3.1 STARTER_MODES="single,cluster"
-  - TEST_SUITE=run-tests-docker        ARANGODB=arangodb:3.1 STARTER_MODES="single,cluster"
+  - TEST_SUITE=run-tests-local-process ARANGODB=arangodb:3.2 STARTER_MODES="single,cluster"
+  - TEST_SUITE=run-tests-docker        ARANGODB=arangodb:3.2 STARTER_MODES="single,cluster"
   - TEST_SUITE=run-tests-local-process ARANGODB=arangodb/arangodb:latest STARTER_MODES="single,cluster"
   - TEST_SUITE=run-tests-docker        ARANGODB=arangodb/arangodb:latest STARTER_MODES="single,cluster"
   - TEST_SUITE=run-tests-local-process ARANGODB=arangodb/arangodb-preview:latest STARTER_MODES="single,cluster,activefailover"
   - TEST_SUITE=run-tests-docker        ARANGODB=arangodb/arangodb-preview:latest STARTER_MODES="single,cluster,activefailover"
 
 script: make $TEST_SUITE
 
-# 3.1 cluster startup is not always a success, causing lots of false positive.
-matrix:
-  allow_failures:
-    - env: TEST_SUITE=run-tests-local-process ARANGODB=arangodb:3.1 STARTER_MODES="single,cluster"
-    - env: TEST_SUITE=run-tests-docker        ARANGODB=arangodb:3.1 STARTER_MODES="single,cluster"
-
 # Install Docker CE
 before_install:
   - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -

test/gexpect.go

@@ -24,6 +24,7 @@ package test
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io"
 	"os"
@@ -153,7 +154,8 @@ func (sp *SubProcess) Wait() error {
 // ExpectTimeout waits for the output of the process to match the given expression, or until a timeout occurs.
 // If a match on the given expression is found, the process output is discard until the end of the match and
 // nil is returned, otherwise a timeout error is returned.
-func (sp *SubProcess) ExpectTimeout(timeout time.Duration, re *regexp.Regexp, id string) error {
+// If the given context is cancelled, nil is returned.
+func (sp *SubProcess) ExpectTimeout(ctx context.Context, timeout time.Duration, re *regexp.Regexp, id string) error {
 	found := make(chan struct{})
 
 	sp.mutex.Lock()
@@ -163,6 +165,8 @@ func (sp *SubProcess) ExpectTimeout(timeout time.Duration, re *regexp.Regexp, id
 	sp.matchExpressions()
 
 	select {
+	case <-ctx.Done():
+		return nil
 	case <-time.After(timeout):
 		// Return timeout error
 		var output []byte

test/passthrough_test.go

@@ -23,6 +23,7 @@
 package test
 
 import (
+	"context"
 	"os"
 	"regexp"
 	"testing"
@@ -39,7 +40,8 @@ func TestPassthroughConflict(t *testing.T) {
 	defer child.Close()
 
 	expr := regexp.MustCompile("is essential to the starters behavior and cannot be overwritten")
-	if err := child.ExpectTimeout(time.Second*15, expr, "starter-passthrough"); err != nil {
+	ctx := context.Background()
+	if err := child.ExpectTimeout(ctx, time.Second*15, expr, "starter-passthrough"); err != nil {
 		t.Errorf("Expected errors message, got %#v", err)
 	}
 }

test/util.go

@@ -144,12 +144,14 @@ type waitUntilReadyResult struct {
 // WaitUntilStarterReady waits until all given starter processes have reached the "Your cluster is ready state"
 func WaitUntilStarterReady(t *testing.T, what string, requiredGoodResults int, starters ...*SubProcess) bool {
 	results := make(chan waitUntilReadyResult, len(starters))
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	for index, starter := range starters {
 		starter := starter // Used in nested function
 		id := fmt.Sprintf("starter-%d", index+1)
 		go func() {
 			started := time.Now()
-			if err := starter.ExpectTimeout(time.Minute*2, regexp.MustCompile(fmt.Sprintf("Your %s can now be accessed with a browser at", what)), id); err != nil {
+			if err := starter.ExpectTimeout(ctx, time.Minute*2, regexp.MustCompile(fmt.Sprintf("Your %s can now be accessed with a browser at", what)), id); err != nil {
 				timeSpan := time.Since(started)
 				results <- waitUntilReadyResult{
 					Ready:    false,