Merge branch 'master' of git://github.com/mapleoin/redis-py into mapleoin-master

Conflicts:
	redis/client.py

1 files changed, 49 insertions, 0 deletions

diff --git a/tests/server_commands.py b/tests/server_commands.py
index 7f8012b..5460538 100644
--- a/tests/server_commands.py
+++ b/tests/server_commands.py
@@ -1509,6 +1509,55 @@ class ServerCommandsTestCase(unittest.TestCase):
             self.client.sort('a', get=('user:*', '#')),
             [b('u1'), b('1'), b('u2'), b('2'), b('u3'), b('3')])
 
+    def test_sort_get_groups_two(self):
+        self.client['user:1'] = 'u1'
+        self.client['user:2'] = 'u2'
+        self.client['user:3'] = 'u3'
+        self.make_list('a', '231')
+        self.assertEquals(
+            self.client.sort('a', get=('user:*', '#'), groups=True),
+            [(b('u1'), b('1')), (b('u2'), b('2')), (b('u3'), b('3'))])
+
+    def test_sort_groups_string_get(self):
+        self.client['user:1'] = 'u1'
+        self.client['user:2'] = 'u2'
+        self.client['user:3'] = 'u3'
+        self.make_list('a', '231')
+        self.assertRaises(redis.DataError, self.client.sort, 'a',
+                          get='user:*', groups=True)
+
+    def test_sort_groups_just_one_get(self):
+        self.client['user:1'] = 'u1'
+        self.client['user:2'] = 'u2'
+        self.client['user:3'] = 'u3'
+        self.make_list('a', '231')
+        self.assertRaises(redis.DataError, self.client.sort, 'a',
+                          get=['user:*'], groups=True)
+
+    def test_sort_groups_no_get(self):
+        self.client['user:1'] = 'u1'
+        self.client['user:2'] = 'u2'
+        self.client['user:3'] = 'u3'
+        self.make_list('a', '231')
+        self.assertRaises(redis.DataError, self.client.sort, 'a', groups=True)
+
+    def test_sort_groups_three_gets(self):
+        self.client['user:1'] = 'u1'
+        self.client['user:2'] = 'u2'
+        self.client['user:3'] = 'u3'
+        self.client['door:1'] = 'd1'
+        self.client['door:2'] = 'd2'
+        self.client['door:3'] = 'd3'
+        self.make_list('a', '231')
+        self.assertEquals(
+            self.client.sort('a', get=('user:*', 'door:*', '#'), groups=True),
+            [
+                (b('u1'), b('d1'), b('1')),
+                (b('u2'), b('d2'), b('2')),
+                (b('u3'), b('d3'), b('3'))
+            ]
+        )
+
     def test_sort_desc(self):
         self.make_list('a', '231')
         self.assertEquals(