re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor test improvements

This commit is contained in:
Dimitrij Denissenko 2015-02-09 08:14:41 +00:00
parent f9d30778d2
commit 66cbad53a1
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
commands_test.go
View File

@ -245,7 +245,7 @@ var _ = Describe("Commands", func() {
keys := client.Keys("*o*") keys := client.Keys("*o*")
Expect(keys.Err()).NotTo(HaveOccurred()) Expect(keys.Err()).NotTo(HaveOccurred())
Expect(sortStrings(keys.Val())).To(Equal([]string{"four", "one", "two"})) Expect(keys.Val()).To(ConsistOf([]string{"four", "one", "two"}))
keys = client.Keys("t??") keys = client.Keys("t??")
Expect(keys.Err()).NotTo(HaveOccurred()) Expect(keys.Err()).NotTo(HaveOccurred())
@ -253,7 +253,7 @@ var _ = Describe("Commands", func() {
keys = client.Keys("*") keys = client.Keys("*")
Expect(keys.Err()).NotTo(HaveOccurred()) Expect(keys.Err()).NotTo(HaveOccurred())
Expect(sortStrings(keys.Val())).To(Equal([]string{"four", "one", "three", "two"})) Expect(keys.Val()).To(ConsistOf([]string{"four", "one", "three", "two"}))
}) })
It("should Migrate", func() { It("should Migrate", func() {
@ -1473,7 +1473,7 @@ var _ = Describe("Commands", func() {
sMembers := client.SMembers("set") sMembers := client.SMembers("set")
Expect(sMembers.Err()).NotTo(HaveOccurred()) Expect(sMembers.Err()).NotTo(HaveOccurred())
Expect(sortStrings(sMembers.Val())).To(Equal([]string{"Hello", "World"})) Expect(sMembers.Val()).To(ConsistOf([]string{"Hello", "World"}))
}) })
It("should SCard", func() { It("should SCard", func() {
@ -1507,7 +1507,7 @@ var _ = Describe("Commands", func() {
sDiff := client.SDiff("set1", "set2") sDiff := client.SDiff("set1", "set2")
Expect(sDiff.Err()).NotTo(HaveOccurred()) Expect(sDiff.Err()).NotTo(HaveOccurred())
Expect(sortStrings(sDiff.Val())).To(Equal([]string{"a", "b"})) Expect(sDiff.Val()).To(ConsistOf([]string{"a", "b"}))
}) })
It("should SDiffStore", func() { It("should SDiffStore", func() {
@ -1531,7 +1531,7 @@ var _ = Describe("Commands", func() {
sMembers := client.SMembers("set") sMembers := client.SMembers("set")
Expect(sMembers.Err()).NotTo(HaveOccurred()) Expect(sMembers.Err()).NotTo(HaveOccurred())
Expect(sortStrings(sMembers.Val())).To(Equal([]string{"a", "b"})) Expect(sMembers.Val()).To(ConsistOf([]string{"a", "b"}))
}) })
It("should SInter", func() { It("should SInter", func() {
@ -1599,7 +1599,7 @@ var _ = Describe("Commands", func() {
sMembers := client.SMembers("set") sMembers := client.SMembers("set")
Expect(sMembers.Err()).NotTo(HaveOccurred()) Expect(sMembers.Err()).NotTo(HaveOccurred())
Expect(sortStrings(sMembers.Val())).To(Equal([]string{"Hello", "World"})) Expect(sMembers.Val()).To(ConsistOf([]string{"Hello", "World"}))
}) })
It("should SMove", func() { It("should SMove", func() {
@ -1621,7 +1621,7 @@ var _ = Describe("Commands", func() {
sMembers = client.SMembers("set2") sMembers = client.SMembers("set2")
Expect(sMembers.Err()).NotTo(HaveOccurred()) Expect(sMembers.Err()).NotTo(HaveOccurred())
Expect(sortStrings(sMembers.Val())).To(Equal([]string{"three", "two"})) Expect(sMembers.Val()).To(ConsistOf([]string{"three", "two"}))
}) })
It("should SPop", func() { It("should SPop", func() {
@ -1676,7 +1676,7 @@ var _ = Describe("Commands", func() {
sMembers := client.SMembers("set") sMembers := client.SMembers("set")
Expect(sMembers.Err()).NotTo(HaveOccurred()) Expect(sMembers.Err()).NotTo(HaveOccurred())
Expect(sortStrings(sMembers.Val())).To(ConsistOf([]string{"three", "two"})) Expect(sMembers.Val()).To(ConsistOf([]string{"three", "two"}))
}) })
It("should SUnion", func() { It("should SUnion", func() {

6
redis_test.go
View File

@ -4,7 +4,6 @@ import (
"net" "net"
"os" "os"
"os/exec" "os/exec"
"sort"
"testing" "testing"
"time" "time"
@ -125,11 +124,6 @@ func TestGinkgoSuite(t *testing.T) {
RunSpecs(t, "gopkg.in/redis.v2") RunSpecs(t, "gopkg.in/redis.v2")
} }
func sortStrings(slice []string) []string {
sort.Strings(slice)
return slice
}
func execCmd(name string, args ...string) (*os.Process, error) { func execCmd(name string, args ...string) (*os.Process, error) {
cmd := exec.Command(name, args...) cmd := exec.Command(name, args...)
if true { if true {