Merge branch 'master' into mem_stomp

mlicheng · Feb 5, 2016 · 8e24b6b · 8e24b6b
2 parents ea5b12d + 5c3cad6
commit 8e24b6b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/test/test_put.py b/test/test_put.py
@@ -1243,8 +1243,11 @@ def test_put_strict_types_empty_record(self):
 
         bins = {}
 
-        assert 0 == TestPut.client_strict_types.put(key, bins)
+        try:
+            assert 0 == TestPut.client_strict_types.put(key, bins)
 
-        (key, _, bins) = TestPut.client_strict_types.get(key)
+            (key, _, bins) = TestPut.client_strict_types.get(key)
 
-        assert bins is None
+            assert bins is None
+        except e.InvalidRequest:
+            pass
diff --git a/test/test_remove_bin.py b/test/test_remove_bin.py
@@ -323,11 +323,14 @@ def test_remove_bin_no_bin(self):
         Invoke remove_bin() no bin
         """
         key = ('test', 'demo', 1)
-        TestRemovebin.client.remove_bin(key, [])
+        try:
+            TestRemovebin.client.remove_bin(key, [])
 
-        (key, _, bins) = TestRemovebin.client.get(key)
+            (key, _, bins) = TestRemovebin.client.get(key)
 
-        assert bins == {'name': 'name1', 'age': 1}
+            assert bins == {'name': 'name1', 'age': 1}
+        except e.InvalidRequest:
+            pass
 
     def test_remove_bin_all_bins(self):
         """

diff --git a/test/test_select.py b/test/test_select.py
@@ -59,13 +59,16 @@ def test_select_with_key_and_empty_list_of_bins_to_select(self):
 
         key = ("test", "demo", 1)
 
-        key, meta, bins = TestSelect.client.select(key, [])
+        try:
+            key, meta, bins = TestSelect.client.select(key, [])
 
-        assert bins == {}
+            assert bins == {}
 
-        assert meta is not None
+            assert meta is not None
 
-        assert key is not None
+            assert key is not None
+        except e.InvalidRequest:
+            pass
 
     def test_select_with_key_and_bins(self):