Skip to content

Commit b6f04d3

Browse files
ofekshenawaofekshenawa
committed
fix tests
1 parent 4c2fca1 commit b6f04d3

File tree

1 file changed

+49
-52
lines changed

1 file changed

+49
-52
lines changed

‎commands_test.go

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,152 +2432,149 @@ var _ = Describe("Commands", func() {
24322432
})
24332433

24342434
It("should HExpire", Label("hash-expiration"), func() {
2435-
//redis client with port 6379
2436-
client1 := redis.NewClient(&redis.Options{Addr: "localhost:6379"})
2437-
res, err := client1.HExpire(ctx, "no_such_key", 10, "field1", "field2", "field3").Result()
2438-
Expect(err).To(HaveOccurred())
2435+
res, err := client.HExpire(ctx, "no_such_key", 10, "field1", "field2", "field3").Result()
2436+
Expect(err).To(BeNil())
24392437
for i := 0; i < 100; i++ {
2440-
sadd := client1.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
2438+
sadd := client.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
24412439
Expect(sadd.Err()).NotTo(HaveOccurred())
24422440
}
24432441

2444-
res, err = client1.HExpire(ctx, "myhash", 10, "key1", "key2", "key200").Result()
2442+
res, err = client.HExpire(ctx, "myhash", 10, "key1", "key2", "key200").Result()
24452443
Expect(err).NotTo(HaveOccurred())
24462444
Expect(res).To(Equal([]int64{1, 1, -2}))
24472445
})
24482446

24492447
It("should HPExpire", Label("hash-expiration"), func() {
2450-
client1 := redis.NewClient(&redis.Options{Addr: "localhost:6379"})
2451-
_, err := client1.HPExpire(ctx, "no_such_key", 10, "field1", "field2", "field3").Result()
2452-
Expect(err).To(HaveOccurred())
2448+
_, err := client.HPExpire(ctx, "no_such_key", 10, "field1", "field2", "field3").Result()
2449+
Expect(err).To(BeNil())
24532450
for i := 0; i < 100; i++ {
2454-
sadd := client1.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
2451+
sadd := client.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
24552452
Expect(sadd.Err()).NotTo(HaveOccurred())
24562453
}
24572454

2458-
res, err := client1.HPExpire(ctx, "myhash", 10, "key1", "key2", "key200").Result()
2455+
res, err := client.HPExpire(ctx, "myhash", 10, "key1", "key2", "key200").Result()
24592456
Expect(err).NotTo(HaveOccurred())
24602457
Expect(res).To(Equal([]int64{1, 1, -2}))
24612458
})
24622459

24632460
It("should HExpireAt", Label("hash-expiration"), func() {
2464-
client1 := redis.NewClient(&redis.Options{Addr: "localhost:6379"})
2465-
_, err := client1.HExpireAt(ctx, "no_such_key", time.Now().Add(10*time.Second), "field1", "field2", "field3").Result()
2466-
Expect(err).To(HaveOccurred())
2461+
2462+
_, err := client.HExpireAt(ctx, "no_such_key", time.Now().Add(10*time.Second), "field1", "field2", "field3").Result()
2463+
Expect(err).To(BeNil())
24672464
for i := 0; i < 100; i++ {
2468-
sadd := client1.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
2465+
sadd := client.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
24692466
Expect(sadd.Err()).NotTo(HaveOccurred())
24702467
}
24712468

2472-
res, err := client1.HExpireAt(ctx, "myhash", time.Now().Add(10*time.Second), "key1", "key2", "key200").Result()
2469+
res, err := client.HExpireAt(ctx, "myhash", time.Now().Add(10*time.Second), "key1", "key2", "key200").Result()
24732470
Expect(err).NotTo(HaveOccurred())
24742471
Expect(res).To(Equal([]int64{1, 1, -2}))
24752472
})
24762473

24772474
It("should HPExpireAt", Label("hash-expiration"), func() {
2478-
client1 := redis.NewClient(&redis.Options{Addr: "localhost:6379"})
2479-
_, err := client1.HPExpireAt(ctx, "no_such_key", time.Now().Add(10*time.Second), "field1", "field2", "field3").Result()
2480-
Expect(err).To(HaveOccurred())
2475+
2476+
_, err := client.HPExpireAt(ctx, "no_such_key", time.Now().Add(10*time.Second), "field1", "field2", "field3").Result()
2477+
Expect(err).To(BeNil())
24812478
for i := 0; i < 100; i++ {
2482-
sadd := client1.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
2479+
sadd := client.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
24832480
Expect(sadd.Err()).NotTo(HaveOccurred())
24842481
}
24852482

2486-
res, err := client1.HPExpireAt(ctx, "myhash", time.Now().Add(10*time.Second), "key1", "key2", "key200").Result()
2483+
res, err := client.HPExpireAt(ctx, "myhash", time.Now().Add(10*time.Second), "key1", "key2", "key200").Result()
24872484
Expect(err).NotTo(HaveOccurred())
24882485
Expect(res).To(Equal([]int64{1, 1, -2}))
24892486
})
24902487

24912488
It("should HPersist", Label("hash-expiration"), func() {
2492-
client1 := redis.NewClient(&redis.Options{Addr: "localhost:6379"})
2493-
_, err := client1.HPersist(ctx, "no_such_key", "field1", "field2", "field3").Result()
2494-
Expect(err).To(HaveOccurred())
2489+
2490+
_, err := client.HPersist(ctx, "no_such_key", "field1", "field2", "field3").Result()
2491+
Expect(err).To(BeNil())
24952492
for i := 0; i < 100; i++ {
2496-
sadd := client1.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
2493+
sadd := client.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
24972494
Expect(sadd.Err()).NotTo(HaveOccurred())
24982495
}
24992496

2500-
res, err := client1.HPersist(ctx, "myhash", "key1", "key2", "key200").Result()
2497+
res, err := client.HPersist(ctx, "myhash", "key1", "key2", "key200").Result()
25012498
Expect(err).NotTo(HaveOccurred())
25022499
Expect(res).To(Equal([]int64{-1, -1, -2}))
25032500

2504-
res, err = client1.HExpire(ctx, "myhash", 10, "key1", "key200").Result()
2501+
res, err = client.HExpire(ctx, "myhash", 10, "key1", "key200").Result()
25052502
Expect(err).NotTo(HaveOccurred())
25062503
Expect(res).To(Equal([]int64{1, -2}))
25072504

2508-
res, err = client1.HPersist(ctx, "myhash", "key1", "key2", "key200").Result()
2505+
res, err = client.HPersist(ctx, "myhash", "key1", "key2", "key200").Result()
25092506
Expect(err).NotTo(HaveOccurred())
25102507
Expect(res).To(Equal([]int64{1, -1, -2}))
25112508
})
25122509

25132510
It("should HExpireTime", Label("hash-expiration"), func() {
2514-
client1 := redis.NewClient(&redis.Options{Addr: "localhost:6379"})
2515-
_, err := client1.HExpireTime(ctx, "no_such_key", "field1", "field2", "field3").Result()
2516-
Expect(err).To(HaveOccurred())
2511+
2512+
_, err := client.HExpireTime(ctx, "no_such_key", "field1", "field2", "field3").Result()
2513+
Expect(err).To(BeNil())
25172514
for i := 0; i < 100; i++ {
2518-
sadd := client1.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
2515+
sadd := client.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
25192516
Expect(sadd.Err()).NotTo(HaveOccurred())
25202517
}
25212518

2522-
res, err := client1.HExpire(ctx, "myhash", 10, "key1", "key200").Result()
2519+
res, err := client.HExpire(ctx, "myhash", 10, "key1", "key200").Result()
25232520
Expect(err).NotTo(HaveOccurred())
25242521
Expect(res).To(Equal([]int64{1, -2}))
25252522

2526-
res, err = client1.HExpireTime(ctx, "myhash", "key1", "key2", "key200").Result()
2523+
res, err = client.HExpireTime(ctx, "myhash", "key1", "key2", "key200").Result()
25272524
Expect(err).NotTo(HaveOccurred())
25282525
Expect(res[0]).To(BeNumerically("~", time.Now().Add(10*time.Second).Unix(), 1))
25292526
})
25302527

25312528
It("should HPExpireTime", Label("hash-expiration"), func() {
2532-
client1 := redis.NewClient(&redis.Options{Addr: "localhost:6379"})
2533-
_, err := client1.HPExpireTime(ctx, "no_such_key", "field1", "field2", "field3").Result()
2534-
Expect(err).To(HaveOccurred())
2529+
2530+
_, err := client.HPExpireTime(ctx, "no_such_key", "field1", "field2", "field3").Result()
2531+
Expect(err).To(BeNil())
25352532
for i := 0; i < 100; i++ {
2536-
sadd := client1.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
2533+
sadd := client.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
25372534
Expect(sadd.Err()).NotTo(HaveOccurred())
25382535
}
25392536

2540-
res, err := client1.HExpire(ctx, "myhash", 10, "key1", "key200").Result()
2537+
res, err := client.HExpire(ctx, "myhash", 10, "key1", "key200").Result()
25412538
Expect(err).NotTo(HaveOccurred())
25422539
Expect(res).To(Equal([]int64{1, -2}))
25432540

2544-
res, err = client1.HPExpireTime(ctx, "myhash", "key1", "key2", "key200").Result()
2541+
res, err = client.HPExpireTime(ctx, "myhash", "key1", "key2", "key200").Result()
25452542
Expect(err).NotTo(HaveOccurred())
25462543
Expect(res).To(BeEquivalentTo([]int64{time.Now().Add(10 * time.Second).UnixMilli(), -1, -2}))
25472544
})
25482545

25492546
It("should HTTL", Label("hash-expiration"), func() {
2550-
client1 := redis.NewClient(&redis.Options{Addr: "localhost:6379"})
2551-
_, err := client1.HTTL(ctx, "no_such_key", "field1", "field2", "field3").Result()
2552-
Expect(err).To(HaveOccurred())
2547+
2548+
_, err := client.HTTL(ctx, "no_such_key", "field1", "field2", "field3").Result()
2549+
Expect(err).To(BeNil())
25532550
for i := 0; i < 100; i++ {
2554-
sadd := client1.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
2551+
sadd := client.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
25552552
Expect(sadd.Err()).NotTo(HaveOccurred())
25562553
}
25572554

2558-
res, err := client1.HExpire(ctx, "myhash", 10, "key1", "key200").Result()
2555+
res, err := client.HExpire(ctx, "myhash", 10, "key1", "key200").Result()
25592556
Expect(err).NotTo(HaveOccurred())
25602557
Expect(res).To(Equal([]int64{1, -2}))
25612558

2562-
res, err = client1.HTTL(ctx, "myhash", "key1", "key2", "key200").Result()
2559+
res, err = client.HTTL(ctx, "myhash", "key1", "key2", "key200").Result()
25632560
Expect(err).NotTo(HaveOccurred())
25642561
Expect(res).To(Equal([]int64{10, -1, -2}))
25652562
})
25662563

25672564
It("should HPTTL", Label("hash-expiration"), func() {
2568-
client1 := redis.NewClient(&redis.Options{Addr: "localhost:6379"})
2569-
_, err := client1.HPTTL(ctx, "no_such_key", "field1", "field2", "field3").Result()
2570-
Expect(err).To(HaveOccurred())
2565+
2566+
_, err := client.HPTTL(ctx, "no_such_key", "field1", "field2", "field3").Result()
2567+
Expect(err).To(BeNil())
25712568
for i := 0; i < 100; i++ {
2572-
sadd := client1.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
2569+
sadd := client.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
25732570
Expect(sadd.Err()).NotTo(HaveOccurred())
25742571
}
25752572

2576-
res, err := client1.HExpire(ctx, "myhash", 10, "key1", "key200").Result()
2573+
res, err := client.HExpire(ctx, "myhash", 10, "key1", "key200").Result()
25772574
Expect(err).NotTo(HaveOccurred())
25782575
Expect(res).To(Equal([]int64{1, -2}))
25792576

2580-
res, err = client1.HPTTL(ctx, "myhash", "key1", "key2", "key200").Result()
2577+
res, err = client.HPTTL(ctx, "myhash", "key1", "key2", "key200").Result()
25812578
Expect(err).NotTo(HaveOccurred())
25822579
Expect(res[0]).To(BeNumerically("~", 10*time.Second.Milliseconds(), 1))
25832580
})

0 commit comments

Comments
 (0)