app type transition (#7167)

1 files changed, 17 insertions, 15 deletions

diff --git a/app/job_test.go b/app/job_test.go
index 8f068901a..09208ec21 100644
--- a/app/job_test.go
+++ b/app/job_test.go
@@ -11,19 +11,20 @@ import (
 )
 
 func TestGetJob(t *testing.T) {
-	Setup()
+	a := Global()
+	a.Setup()
 
 	status := &model.Job{
 		Id:     model.NewId(),
 		Status: model.NewId(),
 	}
-	if result := <-Srv.Store.Job().Save(status); result.Err != nil {
+	if result := <-a.Srv.Store.Job().Save(status); result.Err != nil {
 		t.Fatal(result.Err)
 	}
 
-	defer Srv.Store.Job().Delete(status.Id)
+	defer a.Srv.Store.Job().Delete(status.Id)
 
-	if received, err := GetJob(status.Id); err != nil {
+	if received, err := a.GetJob(status.Id); err != nil {
 		t.Fatal(err)
 	} else if received.Id != status.Id || received.Status != status.Status {
 		t.Fatal("inccorrect job status received")
@@ -31,34 +32,35 @@ func TestGetJob(t *testing.T) {
 }
 
 func TestGetJobByType(t *testing.T) {
-	Setup()
+	a := Global()
+	a.Setup()
 
 	jobType := model.NewId()
 
 	statuses := []*model.Job{
 		{
-			Id:      model.NewId(),
-			Type:    jobType,
+			Id:       model.NewId(),
+			Type:     jobType,
 			CreateAt: 1000,
 		},
 		{
-			Id:      model.NewId(),
-			Type:    jobType,
+			Id:       model.NewId(),
+			Type:     jobType,
 			CreateAt: 999,
 		},
 		{
-			Id:      model.NewId(),
-			Type:    jobType,
+			Id:       model.NewId(),
+			Type:     jobType,
 			CreateAt: 1001,
 		},
 	}
 
 	for _, status := range statuses {
-		store.Must(Srv.Store.Job().Save(status))
-		defer Srv.Store.Job().Delete(status.Id)
+		store.Must(a.Srv.Store.Job().Save(status))
+		defer a.Srv.Store.Job().Delete(status.Id)
 	}
 
-	if received, err := GetJobsByType(jobType, 0, 2); err != nil {
+	if received, err := a.GetJobsByType(jobType, 0, 2); err != nil {
 		t.Fatal(err)
 	} else if len(received) != 2 {
 		t.Fatal("received wrong number of statuses")
@@ -68,7 +70,7 @@ func TestGetJobByType(t *testing.T) {
 		t.Fatal("should've received second newest job second")
 	}
 
-	if received, err := GetJobsByType(jobType, 2, 2); err != nil {
+	if received, err := a.GetJobsByType(jobType, 2, 2); err != nil {
 		t.Fatal(err)
 	} else if len(received) != 1 {
 		t.Fatal("received wrong number of statuses")