Remove overhead from shelling out to execute a job, for purpose of sc…

…heduling tests.

job/job.go

@@ -108,6 +108,9 @@ type Job struct {
 	// when it's done rescheduling rather than when the job is done running.
 	// That's most useful for testing the scheduling aspect of jobs.
 	ranChan chan struct{}
+
+	// Used for testing schedules.
+	succeedInstantly bool
 }
 
 type jobType int

job/job_recurring_test.go

@@ -130,6 +130,7 @@ func TestRecur(t *testing.T) {
 			j := GetMockRecurringJobWithSchedule(start, testStruct.Interval)
 			j.clk.SetClock(clk)
 			j.ResumeAtNextScheduledTime = true // This is important to have on so that there's no drift.
+			j.succeedInstantly = true          // Eliminate any potential variance due to the overhead of shelling out.
 
 			cache := NewMockCache()
 			j.Init(cache)
@@ -144,7 +145,7 @@ func TestRecur(t *testing.T) {
 				select {
 				case <-j.ranChan:
 					t.Fatalf("Expected job not run on checkpoint %d of test %s.", i, testStruct.Name)
-				case <-time.After(time.Second * 2):
+				case <-time.After(time.Second * 1):
 				}
 
 				j.lock.RLock()
@@ -155,15 +156,15 @@ func TestRecur(t *testing.T) {
 
 				select {
 				case <-j.ranChan:
-				case <-time.After(time.Second * 2):
+				case <-time.After(time.Second * 5):
 					t.Fatalf("Expected job to have run on checkpoint %d of test %s.", i, testStruct.Name)
 				}
 
 				j.lock.RLock()
 				assert.Equal(t, i+1, int(j.Metadata.SuccessCount), fmt.Sprintf("2nd Test of %s index %d", testStruct.Name, i))
 				j.lock.RUnlock()
 
-				briefPause()
+				time.Sleep(time.Millisecond * 500)
 			}
 
 		}()

job/runner.go

@@ -50,7 +50,9 @@ func (j *JobRunner) Run(cache JobCache) (*JobStat, Metadata, error) {
 	var out string
 	for {
 		var err error
-		if j.job.JobType == LocalJob {
+		if j.job.succeedInstantly {
+			out = "Job succeeded instantly for test purposes."
+		} else if j.job.JobType == LocalJob {
 			out, err = j.LocalRun()
 		} else if j.job.JobType == RemoteJob {
 			out, err = j.RemoteRun()