| Index: scheduler/appengine/apiservers/scheduler_test.go
|
| diff --git a/scheduler/appengine/apiservers/scheduler_test.go b/scheduler/appengine/apiservers/scheduler_test.go
|
| index 36926ea9098951af5a847489b8244e90be419236..d1667a5998941d67b9659593b42c3380a29ac7d7 100644
|
| --- a/scheduler/appengine/apiservers/scheduler_test.go
|
| +++ b/scheduler/appengine/apiservers/scheduler_test.go
|
| @@ -52,14 +52,14 @@ func TestGetJobsApi(t *testing.T) {
|
| ss := SchedulerServer{fakeEng, catalog}
|
|
|
| Convey("Empty", func() {
|
| - fakeEng.getAllJobs = func() ([]*engine.Job, error) { return []*engine.Job{}, nil }
|
| + fakeEng.getAllJobsRA = func() ([]*engine.Job, error) { return []*engine.Job{}, nil }
|
| reply, err := ss.GetJobs(ctx, nil)
|
| So(err, ShouldBeNil)
|
| So(len(reply.GetJobs()), ShouldEqual, 0)
|
| })
|
|
|
| Convey("All Projects", func() {
|
| - fakeEng.getAllJobs = func() ([]*engine.Job, error) {
|
| + fakeEng.getAllJobsRA = func() ([]*engine.Job, error) {
|
| return []*engine.Job{
|
| {
|
| JobID: "bar/foo",
|
| @@ -97,7 +97,7 @@ func TestGetJobsApi(t *testing.T) {
|
| })
|
|
|
| Convey("One Project", func() {
|
| - fakeEng.getProjectJobs = func(projectID string) ([]*engine.Job, error) {
|
| + fakeEng.getProjectJobsRA = func(projectID string) ([]*engine.Job, error) {
|
| So(projectID, ShouldEqual, "bar")
|
| return []*engine.Job{
|
| {
|
| @@ -122,7 +122,7 @@ func TestGetJobsApi(t *testing.T) {
|
| })
|
|
|
| Convey("Paused but currently running job", func() {
|
| - fakeEng.getProjectJobs = func(projectID string) ([]*engine.Job, error) {
|
| + fakeEng.getProjectJobsRA = func(projectID string) ([]*engine.Job, error) {
|
| So(projectID, ShouldEqual, "bar")
|
| return []*engine.Job{
|
| {
|
| @@ -161,7 +161,7 @@ func TestGetInvocationsApi(t *testing.T) {
|
| ss := SchedulerServer{fakeEng, catalog}
|
|
|
| Convey("Job not found", func() {
|
| - fakeEng.getJob = func(JobID string) (*engine.Job, error) { return nil, nil }
|
| + fakeEng.getJobRA = func(JobID string) (*engine.Job, error) { return nil, nil }
|
| _, err := ss.GetInvocations(ctx, &scheduler.InvocationsRequest{
|
| JobRef: &scheduler.JobRef{Project: "not", Job: "exists"},
|
| })
|
| @@ -171,7 +171,7 @@ func TestGetInvocationsApi(t *testing.T) {
|
| })
|
|
|
| Convey("DS error", func() {
|
| - fakeEng.getJob = func(JobID string) (*engine.Job, error) { return nil, fmt.Errorf("ds error") }
|
| + fakeEng.getJobRA = func(JobID string) (*engine.Job, error) { return nil, fmt.Errorf("ds error") }
|
| _, err := ss.GetInvocations(ctx, &scheduler.InvocationsRequest{
|
| JobRef: &scheduler.JobRef{Project: "proj", Job: "job"},
|
| })
|
| @@ -180,7 +180,7 @@ func TestGetInvocationsApi(t *testing.T) {
|
| So(s.Code(), ShouldEqual, codes.Internal)
|
| })
|
|
|
| - fakeEng.getJob = func(JobID string) (*engine.Job, error) {
|
| + fakeEng.getJobRA = func(JobID string) (*engine.Job, error) {
|
| return &engine.Job{JobID: "proj/job", ProjectID: "proj"}, nil
|
| }
|
|
|
| @@ -397,10 +397,10 @@ func newTestEngine() (*fakeEngine, catalog.Catalog) {
|
| }
|
|
|
| type fakeEngine struct {
|
| - getAllJobs func() ([]*engine.Job, error)
|
| - getProjectJobs func(projectID string) ([]*engine.Job, error)
|
| - getJob func(jobID string) (*engine.Job, error)
|
| - listInvocations func(pageSize int, cursor string) ([]*engine.Invocation, string, error)
|
| + getAllJobsRA func() ([]*engine.Job, error)
|
| + getProjectJobsRA func(projectID string) ([]*engine.Job, error)
|
| + getJobRA func(jobID string) (*engine.Job, error)
|
| + listInvocations func(pageSize int, cursor string) ([]*engine.Invocation, string, error)
|
|
|
| pauseJob func(jobID string, who identity.Identity) error
|
| resumeJob func(jobID string, who identity.Identity) error
|
| @@ -412,16 +412,16 @@ func (f *fakeEngine) GetAllProjects(c context.Context) ([]string, error) {
|
| panic("not implemented")
|
| }
|
|
|
| -func (f *fakeEngine) GetAllJobs(c context.Context) ([]*engine.Job, error) {
|
| - return f.getAllJobs()
|
| +func (f *fakeEngine) GetAllJobsRA(c context.Context) ([]*engine.Job, error) {
|
| + return f.getAllJobsRA()
|
| }
|
|
|
| -func (f *fakeEngine) GetProjectJobs(c context.Context, projectID string) ([]*engine.Job, error) {
|
| - return f.getProjectJobs(projectID)
|
| +func (f *fakeEngine) GetProjectJobsRA(c context.Context, projectID string) ([]*engine.Job, error) {
|
| + return f.getProjectJobsRA(projectID)
|
| }
|
|
|
| -func (f *fakeEngine) GetJob(c context.Context, jobID string) (*engine.Job, error) {
|
| - return f.getJob(jobID)
|
| +func (f *fakeEngine) GetJobRA(c context.Context, jobID string) (*engine.Job, error) {
|
| + return f.getJobRA(jobID)
|
| }
|
|
|
| func (f *fakeEngine) ListInvocations(c context.Context, jobID string, pageSize int, cursor string) ([]*engine.Invocation, string, error) {
|
|
|