Include google compare library

README.md

@@ -58,7 +58,7 @@ Developing Nomad
 
 If you wish to work on Nomad itself or any of its built-in systems,
 you will first need [Go](https://www.golang.org) installed on your
-machine (version 1.8+ is *required*).
+machine (version 1.9+ is *required*).
 
 **Developing with Vagrant**
 There is an included Vagrantfile that can help bootstrap the process. The

nomad/fsm_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/go-cmp/cmp"
 	memdb "github.com/hashicorp/go-memdb"
 	"github.com/hashicorp/nomad/helper"
 	"github.com/hashicorp/nomad/nomad/mock"
@@ -1745,11 +1746,12 @@ func TestFSM_SnapshotRestore_PeriodicLaunches(t *testing.T) {
 	ws := memdb.NewWatchSet()
 	out1, _ := state2.PeriodicLaunchByID(ws, launch1.ID)
 	out2, _ := state2.PeriodicLaunchByID(ws, launch2.ID)
-	if !reflect.DeepEqual(launch1, out1) {
-		t.Fatalf("bad: \n%#v\n%#v", out1, job1)
+
+	if !cmp.Equal(launch1, out1) {
+		t.Fatalf("bad: %v", cmp.Diff(launch1, out1))
 	}
-	if !reflect.DeepEqual(launch2, out2) {
-		t.Fatalf("bad: \n%#v\n%#v", out2, job2)
+	if !cmp.Equal(launch2, out2) {
+		t.Fatalf("bad: %v", cmp.Diff(launch2, out2))
 	}
 }
 

nomad/timetable_test.go

@@ -2,10 +2,12 @@ package nomad
 
 import (
 	"bytes"
-	"reflect"
+	"sync"
 	"testing"
 	"time"
 
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/ugorji/go/codec"
 )
@@ -122,8 +124,10 @@ func TestTimeTable_SerializeDeserialize(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	if !reflect.DeepEqual(tt.table, tt2.table) {
-		t.Fatalf("bad: %#v %#v", tt, tt2)
+	o := cmp.AllowUnexported(TimeTable{})
+	o2 := cmpopts.IgnoreTypes(sync.RWMutex{})
+	if !cmp.Equal(tt.table, tt2.table, o, o2) {
+		t.Fatalf("bad: %s", cmp.Diff(tt, tt2, o, o2))
 	}
 }