Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/pydio/cells
Browse files Browse the repository at this point in the history
  • Loading branch information
bsinou committed Apr 24, 2018
2 parents e180598 + 0ac07f5 commit 0b916c6
Show file tree
Hide file tree
Showing 26 changed files with 720 additions and 838 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![License Badge](https://img.shields.io/badge/License-AGPL%203%2B-blue.svg)](LICENSE)
[![GoDoc](https://godoc.org/github.com/pydio/cells?status.svg)](https://godoc.org/github.com/pydio/cells)
[![Build Status](https://travis-ci.org/pydio/cells.svg?branch=master)](https://travis-ci.org/pydio/cells)
[![Go Report Card](https://goreportcard.com/badge/github.com/pydio/cells?rand=1)](https://goreportcard.com/report/github.com/pydio/cells)
[![Go Report Card](https://goreportcard.com/badge/github.com/pydio/cells?rand=2)](https://goreportcard.com/report/github.com/pydio/cells)


Pydio Cells is the nextgen file sharing platform for organizations. It is a full rewrite of the Pydio project using the Go language following a micro-service architecture.
Expand Down
4 changes: 4 additions & 0 deletions broker/activity/bolt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@ func TestInsertActivity(t *testing.T) {
wg.Wait()

time.Sleep(time.Second * 1)
So(err, ShouldBeNil)
unread = dao.CountUnreadForUser("john")
So(unread, ShouldEqual, 0)
})
}

Expand Down Expand Up @@ -395,6 +397,7 @@ func TestSubscriptions(t *testing.T) {
So(err, ShouldBeNil)

subs, err := dao.ListSubscriptions(activity.OwnerType_NODE, []string{"ROOT"})
So(err, ShouldBeNil)
So(subs, ShouldHaveLength, 1)

So(subs[0].Events, ShouldHaveLength, 2)
Expand All @@ -415,6 +418,7 @@ func TestSubscriptions(t *testing.T) {
So(err, ShouldBeNil)

subs, err := dao.ListSubscriptions(activity.OwnerType_NODE, []string{"ROOT"})
So(err, ShouldBeNil)
So(subs, ShouldHaveLength, 0)

})
Expand Down
3 changes: 3 additions & 0 deletions broker/log/syslog.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ func NewSyslogServer(bleveIndexPath string, deleteOnClose ...bool) (*SyslogServe
} else {
index, err = bleve.New(bleveIndexPath, indexMapping)
}
if err != nil {
return &SyslogServer{}, err
}
return &SyslogServer{Index: index}, nil
}

Expand Down
1 change: 1 addition & 0 deletions common/forms/field_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ func TestFormField_Serialize(t *testing.T) {
</form>`)

jsonMarsh, e := json.MarshalIndent(form.Serialize(), "", " ")
So(e, ShouldBeNil)
log.Print(string(jsonMarsh))

})
Expand Down
20 changes: 0 additions & 20 deletions common/proto/jobs/jobs.micro.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

256 changes: 118 additions & 138 deletions common/proto/jobs/jobs.pb.go

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions common/proto/log/log.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 20 additions & 40 deletions common/proto/rest/broker.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0b916c6

Please sign in to comment.