small fixes

hashicorp · Mar 25, 2016 · 3698bca · 3698bca
1 parent f33bd97
commit 3698bca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/api/jobs_test.go b/api/jobs_test.go
@@ -266,8 +266,9 @@ func TestJobs_Deregister(t *testing.T) {
 	assertWriteMeta(t, wm)
 
 	// Attempting delete on non-existing job returns an error
-	if _, _, err = jobs.Deregister("nope", nil); err == nil {
-		t.Fatalf("expected error deregistering job")
+	if _, _, err = jobs.Deregister("nope", nil); err != nil {
+		t.Fatalf("unexpected error deregistering job: %v", err)
+
 	}
 
 	// Deleting an existing job works

diff --git a/nomad/job_endpoint.go b/nomad/job_endpoint.go
@@ -120,7 +120,7 @@ func (j *Job) Evaluate(args *structs.JobEvaluateRequest, reply *structs.JobRegis
 	if err != nil {
 		return err
 	}
-	if job != nil && job.IsPeriodic() {
+	if job == nil {
 		return fmt.Errorf("job not found")
 	}