Merge branch 'douban:master' into master

douban · Nov 29, 2023 · dd769de · dd769de
2 parents efb1338 + 9522d8a
commit dd769de
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/misc/.cppcheck-supp b/misc/.cppcheck-supp
@@ -1,10 +1,14 @@
+*:include/rapidjson/itoa.h:141
+*:include/rapidjson/itoa.h:216
 *:include/llvm/SmallVector.h:55
 *:include/llvm/SmallVector.h:88
 *:include/llvm/SmallVector.h:134
 *:include/llvm/SmallVector.h:162
+*:include/llvm/SmallVector.h:164
 *:include/llvm/SmallVector.h:214
 *:include/llvm/SmallVector.h:515
 *:include/llvm/SmallVector.h:516
+*:include/llvm/SmallVector.h:546
 *:include/llvm/SmallVector.h:715
 *:include/llvm/SmallVector.h:718
 *:include/llvm/SmallVector.h:726

diff --git a/tests/shabby/reconnect_delay.py b/tests/shabby/reconnect_delay.py
@@ -44,6 +44,12 @@ def test_hard_server_error():
 
  assert mc.set('foo', 1)
  memcached_server_ctl('stop', normal_port)
+
+ # I dont know why,
+ # but the server is still connectable after stop.
+ # add a sleep to wait for the server quit
+ time.sleep(3)
+
  assert not mc.set('foo', 1) # fail
  memcached_server_ctl('start', normal_port)
  assert not mc.set('foo', 1) # still fail

diff --git a/tests/test_cmemcached_regression.py b/tests/test_cmemcached_regression.py
@@ -39,6 +39,9 @@ class NoPickle(object):
  def __getattr__(self, name):
  pass
 
+ def __getstate__(self):
+ raise Exception('can not be pickled')
+
 
 class CmemcachedRegressionCase(unittest.TestCase):