From ec819f9761acc65dad3f1df9153e6c5cdbcc7d7a Mon Sep 17 00:00:00 2001
From: Diptanu Choudhury <diptanuc@gmail.com>
Date: Mon, 2 Nov 2015 13:24:59 -0800
Subject: [PATCH] Fixing tests to not create a TG without restart policies

---
 api/tasks.go                  |  4 ++--
 nomad/structs/structs.go      |  6 ++----
 nomad/structs/structs_test.go | 35 +++++++++++++++++++++++++++++++----
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/api/tasks.go b/api/tasks.go
index 3ef918850..2535d5ec5 100644
--- a/api/tasks.go
+++ b/api/tasks.go
@@ -4,8 +4,8 @@ import (
 	"time"
 )
 
-//RestartPolicy defines how the Nomad client restarts
-//tasks in a taskgroup when they fail
+// RestartPolicy defines how the Nomad client restarts
+// tasks in a taskgroup when they fail
 type RestartPolicy struct {
 	Interval time.Duration
 	Attempts int
diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
index cf81c6afb..a42a8f822 100644
--- a/nomad/structs/structs.go
+++ b/nomad/structs/structs.go
@@ -974,10 +974,8 @@ func (tg *TaskGroup) Validate() error {
 		}
 	}
 
-	if tg.RestartPolicy != nil {
-		if err := tg.RestartPolicy.Validate(); err != nil {
-			mErr.Errors = append(mErr.Errors, err)
-		}
+	if err := tg.RestartPolicy.Validate(); err != nil {
+		mErr.Errors = append(mErr.Errors, err)
 	}
 
 	// Check for duplicate tasks
diff --git a/nomad/structs/structs_test.go b/nomad/structs/structs_test.go
index cabf83dfa..1f107b095 100644
--- a/nomad/structs/structs_test.go
+++ b/nomad/structs/structs_test.go
@@ -1,11 +1,11 @@
 package structs
 
 import (
+	"github.com/hashicorp/go-multierror"
 	"reflect"
 	"strings"
 	"testing"
-
-	"github.com/hashicorp/go-multierror"
+	"time"
 )
 
 func TestJob_Validate(t *testing.T) {
@@ -44,11 +44,27 @@ func TestJob_Validate(t *testing.T) {
 		TaskGroups: []*TaskGroup{
 			&TaskGroup{
 				Name: "web",
+				RestartPolicy: &RestartPolicy{
+					Interval: 5 * time.Minute,
+					Delay:    10 * time.Second,
+					Attempts: 10,
+				},
 			},
 			&TaskGroup{
 				Name: "web",
+				RestartPolicy: &RestartPolicy{
+					Interval: 5 * time.Minute,
+					Delay:    10 * time.Second,
+					Attempts: 10,
+				},
+			},
+			&TaskGroup{
+				RestartPolicy: &RestartPolicy{
+					Interval: 5 * time.Minute,
+					Delay:    10 * time.Second,
+					Attempts: 10,
+				},
 			},
-			&TaskGroup{},
 		},
 	}
 	err = j.Validate()
@@ -65,7 +81,13 @@ func TestJob_Validate(t *testing.T) {
 }
 
 func TestTaskGroup_Validate(t *testing.T) {
-	tg := &TaskGroup{}
+	tg := &TaskGroup{
+		RestartPolicy: &RestartPolicy{
+			Interval: 5 * time.Minute,
+			Delay:    10 * time.Second,
+			Attempts: 10,
+		},
+	}
 	err := tg.Validate()
 	mErr := err.(*multierror.Error)
 	if !strings.Contains(mErr.Errors[0].Error(), "group name") {
@@ -86,6 +108,11 @@ func TestTaskGroup_Validate(t *testing.T) {
 			&Task{Name: "web"},
 			&Task{},
 		},
+		RestartPolicy: &RestartPolicy{
+			Interval: 5 * time.Minute,
+			Delay:    10 * time.Second,
+			Attempts: 10,
+		},
 	}
 	err = tg.Validate()
 	mErr = err.(*multierror.Error)