From e101b2cf7c172d1c4ff20e0df63917b5b8f923ed Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Tue, 15 Mar 2016 19:54:04 -0700 Subject: Fixing unit tests --- api/admin.go | 2 +- store/sql_compliance_store_test.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/admin.go b/api/admin.go index 9de9f5dd8..2990691a6 100644 --- a/api/admin.go +++ b/api/admin.go @@ -254,7 +254,7 @@ func downloadComplianceReport(c *Context, w http.ResponseWriter, r *http.Request return } else { job := result.Data.(*model.Compliance) - c.LogAudit("downloaded " + job.JobName()) + c.LogAudit("downloaded " + job.Desc) if f, err := ioutil.ReadFile(*utils.Cfg.ComplianceSettings.Directory + "compliance/" + job.JobName() + ".zip"); err != nil { c.Err = model.NewLocAppError("readFile", "api.file.read_file.reading_local.app_error", nil, err.Error()) diff --git a/store/sql_compliance_store_test.go b/store/sql_compliance_store_test.go index 2f3ef3569..1a41fa389 100644 --- a/store/sql_compliance_store_test.go +++ b/store/sql_compliance_store_test.go @@ -12,11 +12,11 @@ import ( func TestSqlComplianceStore(t *testing.T) { Setup() - compliance1 := &model.Compliance{Desc: "Desc", UserId: model.NewId(), Status: "TestStatus1", StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1} + compliance1 := &model.Compliance{Desc: "Audit for federal subpoena case #22443", UserId: model.NewId(), Status: model.COMPLIANCE_STATUS_FAILED, StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1, Type: model.COMPLIANCE_TYPE_ADHOC} Must(store.Compliance().Save(compliance1)) time.Sleep(100 * time.Millisecond) - compliance2 := &model.Compliance{Desc: "Desc", UserId: model.NewId(), Status: "TestStatus2", StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1} + compliance2 := &model.Compliance{Desc: "Audit for federal subpoena case #11458", UserId: model.NewId(), Status: model.COMPLIANCE_STATUS_RUNNING, StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1, Type: model.COMPLIANCE_TYPE_ADHOC} Must(store.Compliance().Save(compliance2)) time.Sleep(100 * time.Millisecond) @@ -24,18 +24,18 @@ func TestSqlComplianceStore(t *testing.T) { result := <-c compliances := result.Data.(model.Compliances) - if compliances[0].Status != "TestStatus2" && compliance2.Id != compliances[0].Id { + if compliances[0].Status != model.COMPLIANCE_STATUS_RUNNING && compliance2.Id != compliances[0].Id { t.Fatal() } - compliance2.Status = "TestUpdateStatus2" + compliance2.Status = model.COMPLIANCE_STATUS_FAILED Must(store.Compliance().Update(compliance2)) c = store.Compliance().GetAll() result = <-c compliances = result.Data.(model.Compliances) - if compliances[0].Status != "TestUpdateStatus2" && compliance2.Id != compliances[0].Id { + if compliances[0].Status != model.COMPLIANCE_STATUS_FAILED && compliance2.Id != compliances[0].Id { t.Fatal() } -- cgit v1.2.3-1-g7c22