Merge pull request redis#646 from lamby/embedded-string-test

Fix tests under Redis 3.x; we can be of an "embedded string" format now.
rolette · Aug 20, 2015 · 03ac9e2 · 03ac9e2
2 parents 81429b4 + 550eee8
commit 03ac9e2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tests/test_commands.py b/tests/test_commands.py
@@ -112,7 +112,7 @@ def test_object(self, r):
         r['a'] = 'foo'
         assert isinstance(r.object('refcount', 'a'), int)
         assert isinstance(r.object('idletime', 'a'), int)
-        assert r.object('encoding', 'a') == b('raw')
+        assert r.object('encoding', 'a') in (b('raw'), b('embstr'))
         assert r.object('idletime', 'invalid-key') is None
 
     def test_ping(self, r):