nomad: test waitForIndex

nomad/worker.go

@@ -170,7 +170,7 @@ CHECK:
 
 	// Check if we've reached our limit
 	if time.Now().Sub(start) > timeout {
-		return fmt.Errorf("sync wait limit reached")
+		return fmt.Errorf("sync wait timeout reached")
 	}
 
 	// Exponential back off if we haven't yet reached it

nomad/worker_test.go

@@ -2,6 +2,7 @@ package nomad
 
 import (
 	"reflect"
+	"strings"
 	"testing"
 	"time"
 
@@ -109,3 +110,34 @@ func TestWorker_sendAck(t *testing.T) {
 		t.Fatalf("bad: %#v", stats)
 	}
 }
+
+func TestWorker_waitForIndex(t *testing.T) {
+	s1 := testServer(t, func(c *Config) {
+		c.NumSchedulers = 0
+		c.EnabledSchedulers = []string{structs.JobTypeService}
+	})
+	defer s1.Shutdown()
+	testutil.WaitForLeader(t, s1.RPC)
+
+	// Get the current index
+	index := s1.raft.AppliedIndex()
+
+	// Cause an increment
+	go func() {
+		time.Sleep(10 * time.Millisecond)
+		s1.raft.Barrier(0)
+	}()
+
+	// Wait for a future index
+	w := &Worker{srv: s1, logger: s1.logger}
+	err := w.waitForIndex(index+1, time.Second)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	// Cause a timeout
+	err = w.waitForIndex(index+100, 10*time.Millisecond)
+	if err == nil || !strings.Contains(err.Error(), "timeout") {
+		t.Fatalf("err: %v", err)
+	}
+}