Add tests

executor/mock/jobrunner.go

@@ -62,6 +62,16 @@ func (jobRunResponse *JobRunResponse) WaitForSuccess() bool {
 	return status == "TASK_FINISHED"
 }
 
+// WaitForFailure blocks on the jobs completion and returns true
+// if it exits with a non-zero (user) error
+func (jobRunResponse *JobRunResponse) WaitForFailure() bool {
+	status, err := jobRunResponse.WaitForCompletion()
+	if err != nil {
+		return false
+	}
+	return status == "TASK_FAILED"
+}
+
 // WaitForCompletion blocks on the jobs completion and returns its status
 // if it completed successfully.
 func (jobRunResponse *JobRunResponse) WaitForCompletion() (string, error) {
@@ -239,6 +249,15 @@ func RunJobExpectingSuccess(jobInput *JobInput) bool {
 	return jobResult.WaitForSuccess()
 }
 
+// RunJobExpectingFailure is similar to RunJob but returns true when the task completes successfully.
+func RunJobExpectingFailure(jobInput *JobInput) bool {
+	jobRunner := NewJobRunner()
+	defer jobRunner.StopExecutor()
+
+	jobResult := jobRunner.StartJob(jobInput)
+	return jobResult.WaitForFailure()
+}
+
 // RunJob runs a single Titus task based on provided JobInput
 func RunJob(jobInput *JobInput) (string, error) {
 	jobRunner := NewJobRunner()

executor/mock/standalone/standalone_test.go

@@ -66,6 +66,10 @@ var (
 		name: "titusoss/pty",
 		tag:  "20180507-1525733149",
 	}
+	envLabel = testImage{
+		name: "titusoss/ubuntu-env-label",
+		tag:  "20180621-1529540359",
+	}
 )
 
 // This file still uses log as opposed to using the testing library's built-in logging framework.
@@ -99,6 +103,10 @@ func TestStandalone(t *testing.T) {
 		testSchedBatch,
 		testSchedNormal,
 		testSchedIdle,
+		testNewEnvironmentLocationPositive,
+		testNewEnvironmentLocationNegative,
+		testOldEnvironmentLocationPositive,
+		testOldEnvironmentLocationNegative,
 	}
 	for _, fun := range testFunctions {
 		fullName := runtime.FuncForPC(reflect.ValueOf(fun).Pointer()).Name()
@@ -615,3 +623,51 @@ func testSchedIdle(t *testing.T, jobID string) {
 		t.Fail()
 	}
 }
+
+func testNewEnvironmentLocationPositive(t *testing.T, jobID string) {
+	ji := &mock.JobInput{
+		ImageName:  envLabel.name,
+		Version:    envLabel.tag,
+		Entrypoint: `cat /etc/nflx/base-environment.d/titus`,
+		JobID:      jobID,
+	}
+	if !mock.RunJobExpectingSuccess(ji) {
+		t.Fail()
+	}
+}
+
+func testNewEnvironmentLocationNegative(t *testing.T, jobID string) {
+	ji := &mock.JobInput{
+		ImageName:  envLabel.name,
+		Version:    envLabel.tag,
+		Entrypoint: `cat /etc/profile.d/netflix_environment.sh`,
+		JobID:      jobID,
+	}
+	if !mock.RunJobExpectingFailure(ji) {
+		t.Fail()
+	}
+}
+
+func testOldEnvironmentLocationPositive(t *testing.T, jobID string) {
+	ji := &mock.JobInput{
+		ImageName:  ubuntu.name,
+		Version:    ubuntu.tag,
+		Entrypoint: `cat /etc/profile.d/netflix_environment.sh`,
+		JobID:      jobID,
+	}
+	if !mock.RunJobExpectingSuccess(ji) {
+		t.Fail()
+	}
+}
+func testOldEnvironmentLocationNegative(t *testing.T, jobID string) {
+
+	ji := &mock.JobInput{
+		ImageName:  ubuntu.name,
+		Version:    ubuntu.tag,
+		Entrypoint: `cat /etc/nflx/base-environment.d/titus`,
+		JobID:      jobID,
+	}
+	if !mock.RunJobExpectingFailure(ji) {
+		t.Fail()
+	}
+}