From 795c786ca51bd6b79e6ea967ba269ebfc865b95e Mon Sep 17 00:00:00 2001
From: Diptanu Choudhury <diptanuc@gmail.com>
Date: Mon, 2 Nov 2015 15:04:04 -0800
Subject: [PATCH] Fixed the tests

---
 nomad/structs/structs.go | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
index f6feaa3de..589781580 100644
--- a/nomad/structs/structs.go
+++ b/nomad/structs/structs.go
@@ -14,17 +14,8 @@ import (
 )
 
 var (
-	ErrNoLeader           = fmt.Errorf("No cluster leader")
-	ErrNoRegionPath       = fmt.Errorf("No path to region")
-	BatchJobRestartPolicy = RestartPolicy{
-		Delay:    15 * time.Second,
-		Attempts: 15,
-	}
-	ServiceJobRestartPolicy = RestartPolicy{
-		Delay:    15 * time.Second,
-		Attempts: 2,
-		Interval: 1 * time.Minute,
-	}
+	ErrNoLeader     = fmt.Errorf("No cluster leader")
+	ErrNoRegionPath = fmt.Errorf("No path to region")
 )
 
 type MessageType uint8
@@ -925,9 +916,16 @@ func (r *RestartPolicy) Validate() error {
 func NewRestartPolicy(jobType string) *RestartPolicy {
 	switch jobType {
 	case JobTypeService:
-		return &ServiceJobRestartPolicy
+		return &RestartPolicy{
+			Delay:    15 * time.Second,
+			Attempts: 2,
+			Interval: 1 * time.Minute,
+		}
 	case JobTypeBatch:
-		return &BatchJobRestartPolicy
+		return &RestartPolicy{
+			Delay:    15 * time.Second,
+			Attempts: 15,
+		}
 	default:
 		return nil
 	}