vbatts/ntfy
1
0
Fork 0
Code Pull requests Activity

WIP: Shorter lock, for #338

Browse source
This commit is contained in:
Philipp Heckel 2022-06-21 19:07:27 -04:00
parent 4e29216b5f
commit 85f2252a77
3 changed files with 41 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/message_cache_test.go
View file

@ -34,7 +34,7 @@ func testCacheMessages(t *testing.T, c *messageCache) {
require.Equal(t, errUnexpectedMessageType, c.AddMessage(newOpenMessage("example"))) // These should not be added!
// mytopic: count
count, err := c.MessageCount("mytopic")
count, err := c.MessageCounts("mytopic")
require.Nil(t, err)
require.Equal(t, 2, count)
@ -66,7 +66,7 @@ func testCacheMessages(t *testing.T, c *messageCache) {
require.Equal(t, "my other message", messages[0].Message)
// example: count
count, err = c.MessageCount("example")
count, err = c.MessageCounts("example")
require.Nil(t, err)
require.Equal(t, 1, count)
@ -75,7 +75,7 @@ func testCacheMessages(t *testing.T, c *messageCache) {
require.Equal(t, "my example message", messages[0].Message)
// non-existing: count
count, err = c.MessageCount("doesnotexist")
count, err = c.MessageCounts("doesnotexist")
require.Nil(t, err)
require.Equal(t, 0, count)
@ -255,11 +255,11 @@ func testCachePrune(t *testing.T, c *messageCache) {
require.Nil(t, c.AddMessage(m3))
require.Nil(t, c.Prune(time.Unix(2, 0)))
count, err := c.MessageCount("mytopic")
count, err := c.MessageCounts("mytopic")
require.Nil(t, err)
require.Equal(t, 1, count)
count, err = c.MessageCount("another_topic")
count, err = c.MessageCounts("another_topic")
require.Nil(t, err)
require.Equal(t, 0, count)