Make hard and IO timeouts configurable in swarming.go

go/swarming/swarming_test.go

 package swarming
 
 import (
         "encoding/json"
         "fmt"
         "io/ioutil"
         "path"
         "path/filepath"
         "strings"
         "testing"
@@ skipping 88 matching lines @@
         assert.Nil(t, err)
         assert.Equal(t, 2, len(tasksToHashes))
         for _, taskName := range taskNames {
                 hash, exists := tasksToHashes[taskName]
                 assert.True(t, exists)
                 assert.NotNil(t, hash)
         }
 
         // Trigger swarming using the isolate hashes.
         dimensions := map[string]string{"pool": "Chrome"}
-        tasks, err := s.TriggerSwarmingTasks(tasksToHashes, dimensions, RECOMMENDED_PRIORITY, RECOMMENDED_EXPIRATION, false)
+        tasks, err := s.TriggerSwarmingTasks(tasksToHashes, dimensions, RECOMMENDED_PRIORITY, RECOMMENDED_EXPIRATION, RECOMMENDED_HARD_TIMEOUT, RECOMMENDED_IO_TIMEOUT, false)
         assert.Nil(t, err)
 
         // Collect both output and file output of all tasks.
         for _, task := range tasks {
                 output, outputDir, err := task.Collect(s)
                 assert.Nil(t, err)
                 output = sanitizeOutput(output)
                 assert.Equal(t, fmt.Sprintf("arg_1_%s\narg_2_%s\n", task.Title, task.Title), output)
                 // Verify contents of the outputDir.
                 rawFileOutput, err := ioutil.ReadFile(path.Join(outputDir, "output.txt"))
@@ skipping 41 matching lines @@
         assert.Nil(t, err)
         assert.Equal(t, 2, len(tasksToHashes))
         for _, taskName := range taskNames {
                 hash, exists := tasksToHashes[taskName]
                 assert.True(t, exists)
                 assert.NotNil(t, hash)
         }
 
         // Trigger swarming using the isolate hashes.
         dimensions := map[string]string{"pool": "Chrome"}
-        tasks, err := s.TriggerSwarmingTasks(tasksToHashes, dimensions, RECOMMENDED_PRIORITY, RECOMMENDED_EXPIRATION, false)
+        tasks, err := s.TriggerSwarmingTasks(tasksToHashes, dimensions, RECOMMENDED_PRIORITY, RECOMMENDED_EXPIRATION, RECOMMENDED_HARD_TIMEOUT, RECOMMENDED_IO_TIMEOUT, false)
         assert.Nil(t, err)
 
         // Collect testTask1. It should have failed.
         output1, outputDir1, err1 := tasks[0].Collect(s)
         output1 = sanitizeOutput(output1)
         assert.Equal(t, "", output1)
         assert.Equal(t, "", outputDir1)
         assert.NotNil(t, err1)
         assert.True(t, strings.HasPrefix(err1.Error(), "Swarming trigger for testTask1 failed with: Command exited with exit status 1: "))
 
         // Collect testTask2. It should have succeeded.
         output2, outputDir2, err2 := tasks[1].Collect(s)
         assert.Nil(t, err2)
         output2 = sanitizeOutput(output2)
         assert.Equal(t, fmt.Sprintf("arg_1_%s\narg_2_%s\n", tasks[1].Title, tasks[1].Title), output2)
         // Verify contents of the outputDir.
         rawFileOutput, err := ioutil.ReadFile(path.Join(outputDir2, "output.txt"))
         assert.Nil(t, err)
         fileOutput := strings.Replace(string(rawFileOutput), "\r\n", "\n", -1)
         assert.Equal(t, "testing\ntesting", fileOutput)
 }
 
 // sanitizeOutput makes the task output consistent. Sometimes the outputs comes
 // back with "\r\n" and sometimes with "\n". This function makes it always be "\n".
 func sanitizeOutput(output string) string {
         return strings.Replace(output, "\r\n", "\n", -1)
 }