mirror of
https://github.com/redis/go-redis.git
synced 2025-07-28 06:42:00 +03:00
Fix tests
This commit is contained in:
2
Makefile
2
Makefile
@ -3,6 +3,8 @@ all: testdeps
|
|||||||
go test ./... -short -race
|
go test ./... -short -race
|
||||||
env GOOS=linux GOARCH=386 go test ./...
|
env GOOS=linux GOARCH=386 go test ./...
|
||||||
go vet
|
go vet
|
||||||
|
go get github.com/gordonklaus/ineffassign
|
||||||
|
ineffassign .
|
||||||
|
|
||||||
testdeps: testdata/redis/src/redis-server
|
testdeps: testdata/redis/src/redis-server
|
||||||
|
|
||||||
|
@ -1447,6 +1447,7 @@ type XReadGroupArgs struct {
|
|||||||
Streams []string
|
Streams []string
|
||||||
Count int64
|
Count int64
|
||||||
Block time.Duration
|
Block time.Duration
|
||||||
|
NoAck bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *cmdable) XReadGroup(a *XReadGroupArgs) *XStreamSliceCmd {
|
func (c *cmdable) XReadGroup(a *XReadGroupArgs) *XStreamSliceCmd {
|
||||||
@ -1458,6 +1459,9 @@ func (c *cmdable) XReadGroup(a *XReadGroupArgs) *XStreamSliceCmd {
|
|||||||
if a.Block >= 0 {
|
if a.Block >= 0 {
|
||||||
args = append(args, "block", int64(a.Block/time.Millisecond))
|
args = append(args, "block", int64(a.Block/time.Millisecond))
|
||||||
}
|
}
|
||||||
|
if a.NoAck {
|
||||||
|
args = append(args, "noack")
|
||||||
|
}
|
||||||
args = append(args, "streams")
|
args = append(args, "streams")
|
||||||
for _, s := range a.Streams {
|
for _, s := range a.Streams {
|
||||||
args = append(args, s)
|
args = append(args, s)
|
||||||
|
@ -69,7 +69,7 @@ var _ = Describe("Commands", func() {
|
|||||||
val, err := client.Wait(1, wait).Result()
|
val, err := client.Wait(1, wait).Result()
|
||||||
Expect(err).NotTo(HaveOccurred())
|
Expect(err).NotTo(HaveOccurred())
|
||||||
Expect(val).To(Equal(int64(0)))
|
Expect(val).To(Equal(int64(0)))
|
||||||
Expect(time.Now()).To(BeTemporally("~", start.Add(wait), time.Second))
|
Expect(time.Now()).To(BeTemporally("~", start.Add(wait), 3*time.Second))
|
||||||
})
|
})
|
||||||
|
|
||||||
It("should Select", func() {
|
It("should Select", func() {
|
||||||
@ -2793,10 +2793,13 @@ var _ = Describe("Commands", func() {
|
|||||||
Member: "one",
|
Member: "one",
|
||||||
}).Err()
|
}).Err()
|
||||||
Expect(err).NotTo(HaveOccurred())
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
|
||||||
err = client.ZAdd("zset", redis.Z{
|
err = client.ZAdd("zset", redis.Z{
|
||||||
Score: 2,
|
Score: 2,
|
||||||
Member: "two",
|
Member: "two",
|
||||||
}).Err()
|
}).Err()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
|
||||||
members, err = client.ZPopMin("zset", 10).Result()
|
members, err = client.ZPopMin("zset", 10).Result()
|
||||||
Expect(err).NotTo(HaveOccurred())
|
Expect(err).NotTo(HaveOccurred())
|
||||||
Expect(members).To(Equal([]redis.Z{{
|
Expect(members).To(Equal([]redis.Z{{
|
||||||
@ -3541,8 +3544,9 @@ var _ = Describe("Commands", func() {
|
|||||||
res, err := client.XReadGroup(&redis.XReadGroupArgs{
|
res, err := client.XReadGroup(&redis.XReadGroupArgs{
|
||||||
Group: "group",
|
Group: "group",
|
||||||
Consumer: "consumer",
|
Consumer: "consumer",
|
||||||
Streams: []string{"stream", "0"},
|
Streams: []string{"stream", ">"},
|
||||||
}).Result()
|
}).Result()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
Expect(res).To(Equal([]redis.XStream{{
|
Expect(res).To(Equal([]redis.XStream{{
|
||||||
Stream: "stream",
|
Stream: "stream",
|
||||||
Messages: []redis.XMessage{
|
Messages: []redis.XMessage{
|
||||||
|
Reference in New Issue
Block a user