Skip to content

Commit 55db937

Browse files
author
Mahmood Ali
committed
tests: update AR task restart policy
1 parent c55f3ed commit 55db937

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

client/allocrunner/alloc_runner_test.go

+9-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ func TestAllocRunner_TaskLeader_KillTG(t *testing.T) {
5454
alloc := mock.BatchAlloc()
5555
tr := alloc.AllocatedResources.Tasks[alloc.Job.TaskGroups[0].Tasks[0].Name]
5656
alloc.Job.TaskGroups[0].RestartPolicy.Attempts = 0
57+
alloc.Job.TaskGroups[0].Tasks[0].RestartPolicy.Attempts = 0
5758

5859
// Create two tasks in the task group
5960
task := alloc.Job.TaskGroups[0].Tasks[0]
@@ -147,6 +148,7 @@ func TestAllocRunner_TaskGroup_ShutdownDelay(t *testing.T) {
147148
alloc := mock.Alloc()
148149
tr := alloc.AllocatedResources.Tasks[alloc.Job.TaskGroups[0].Tasks[0].Name]
149150
alloc.Job.TaskGroups[0].RestartPolicy.Attempts = 0
151+
alloc.Job.TaskGroups[0].Tasks[0].RestartPolicy.Attempts = 0
150152

151153
// Create a group service
152154
tg := alloc.Job.TaskGroups[0]
@@ -276,6 +278,7 @@ func TestAllocRunner_TaskLeader_StopTG(t *testing.T) {
276278
alloc := mock.Alloc()
277279
tr := alloc.AllocatedResources.Tasks[alloc.Job.TaskGroups[0].Tasks[0].Name]
278280
alloc.Job.TaskGroups[0].RestartPolicy.Attempts = 0
281+
alloc.Job.TaskGroups[0].Tasks[0].RestartPolicy.Attempts = 0
279282

280283
// Create 3 tasks in the task group
281284
task := alloc.Job.TaskGroups[0].Tasks[0]
@@ -374,6 +377,7 @@ func TestAllocRunner_TaskLeader_StopRestoredTG(t *testing.T) {
374377
alloc := mock.Alloc()
375378
tr := alloc.AllocatedResources.Tasks[alloc.Job.TaskGroups[0].Tasks[0].Name]
376379
alloc.Job.TaskGroups[0].RestartPolicy.Attempts = 0
380+
alloc.Job.TaskGroups[0].Tasks[0].RestartPolicy.Attempts = 0
377381

378382
// Create a leader and follower task in the task group
379383
task := alloc.Job.TaskGroups[0].Tasks[0]
@@ -900,12 +904,14 @@ func TestAllocRunner_HandlesArtifactFailure(t *testing.T) {
900904
t.Parallel()
901905

902906
alloc := mock.BatchAlloc()
903-
alloc.Job.TaskGroups[0].RestartPolicy = &structs.RestartPolicy{
907+
rp := &structs.RestartPolicy{
904908
Mode: structs.RestartPolicyModeFail,
905909
Attempts: 1,
906910
Delay: time.Nanosecond,
907911
Interval: time.Hour,
908912
}
913+
alloc.Job.TaskGroups[0].RestartPolicy = rp
914+
alloc.Job.TaskGroups[0].Tasks[0].RestartPolicy = rp
909915

910916
// Create a new task with a bad artifact
911917
badtask := alloc.Job.TaskGroups[0].Tasks[0].Copy()
@@ -958,6 +964,7 @@ func TestAllocRunner_TaskFailed_KillTG(t *testing.T) {
958964
alloc := mock.Alloc()
959965
tr := alloc.AllocatedResources.Tasks[alloc.Job.TaskGroups[0].Tasks[0].Name]
960966
alloc.Job.TaskGroups[0].RestartPolicy.Attempts = 0
967+
alloc.Job.TaskGroups[0].Tasks[0].RestartPolicy.Attempts = 0
961968

962969
// Create two tasks in the task group
963970
task := alloc.Job.TaskGroups[0].Tasks[0]
@@ -1087,6 +1094,7 @@ func TestAllocRunner_TerminalUpdate_Destroy(t *testing.T) {
10871094
alloc := mock.BatchAlloc()
10881095
tr := alloc.AllocatedResources.Tasks[alloc.Job.TaskGroups[0].Tasks[0].Name]
10891096
alloc.Job.TaskGroups[0].RestartPolicy.Attempts = 0
1097+
alloc.Job.TaskGroups[0].Tasks[0].RestartPolicy.Attempts = 0
10901098
// Ensure task takes some time
10911099
task := alloc.Job.TaskGroups[0].Tasks[0]
10921100
task.Driver = "mock_driver"

0 commit comments

Comments
 (0)