IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixing unit tests

Browse Source
This commit is contained in:
=Corey Hulen
2016-03-15 19:54:04 -07:00
parent ae2e80148e
commit e101b2cf7c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/admin.go
View File

@@ -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())

10
store/sql_compliance_store_test.go
View File

@@ -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()
}