Skip to content

Commit a81dc99

Browse files
author
Mahmood Ali
committed
tests: update AR task restart policy
1 parent e20527f commit a81dc99

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]
@@ -861,12 +865,14 @@ func TestAllocRunner_HandlesArtifactFailure(t *testing.T) {
861865
t.Parallel()
862866

863867
alloc := mock.BatchAlloc()
864-
alloc.Job.TaskGroups[0].RestartPolicy = &structs.RestartPolicy{
868+
rp := &structs.RestartPolicy{
865869
Mode: structs.RestartPolicyModeFail,
866870
Attempts: 1,
867871
Delay: time.Nanosecond,
868872
Interval: time.Hour,
869873
}
874+
alloc.Job.TaskGroups[0].RestartPolicy = rp
875+
alloc.Job.TaskGroups[0].Tasks[0].RestartPolicy = rp
870876

871877
// Create a new task with a bad artifact
872878
badtask := alloc.Job.TaskGroups[0].Tasks[0].Copy()
@@ -919,6 +925,7 @@ func TestAllocRunner_TaskFailed_KillTG(t *testing.T) {
919925
alloc := mock.Alloc()
920926
tr := alloc.AllocatedResources.Tasks[alloc.Job.TaskGroups[0].Tasks[0].Name]
921927
alloc.Job.TaskGroups[0].RestartPolicy.Attempts = 0
928+
alloc.Job.TaskGroups[0].Tasks[0].RestartPolicy.Attempts = 0
922929

923930
// Create two tasks in the task group
924931
task := alloc.Job.TaskGroups[0].Tasks[0]
@@ -1048,6 +1055,7 @@ func TestAllocRunner_TerminalUpdate_Destroy(t *testing.T) {
10481055
alloc := mock.BatchAlloc()
10491056
tr := alloc.AllocatedResources.Tasks[alloc.Job.TaskGroups[0].Tasks[0].Name]
10501057
alloc.Job.TaskGroups[0].RestartPolicy.Attempts = 0
1058+
alloc.Job.TaskGroups[0].Tasks[0].RestartPolicy.Attempts = 0
10511059
// Ensure task takes some time
10521060
task := alloc.Job.TaskGroups[0].Tasks[0]
10531061
task.Driver = "mock_driver"

0 commit comments

Comments
 (0)