From 324445c56b1c76f3c122b465413c4807685d65da Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Mon, 12 Nov 2007 13:20:56 -0800
Subject: [PATCH] Updated tests (including one possible failing test from Brian
 Moon)

---
 tests/function.c     |  5 -----
 tests/output.res     | 11 +++++++++++
 tests/t/memslap.test |  2 ++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/function.c b/tests/function.c
index 37f2c490..12dfd34f 100644
--- a/tests/function.c
+++ b/tests/function.c
@@ -893,7 +893,6 @@ uint8_t user_supplied_bug4(memcached_st *memc)
 
   /* We need to empty the server before continueing test */
   rc= memcached_flush(memc, 0);
-  WATCHPOINT_ERROR(rc);
   assert(rc == MEMCACHED_NO_SERVERS);
 
   rc= memcached_mget(memc, keys, key_length, 3);
@@ -908,7 +907,6 @@ uint8_t user_supplied_bug4(memcached_st *memc)
   assert(return_value_length == 0);
   assert(rc == MEMCACHED_NO_SERVERS);
 
-  WATCHPOINT;
   for (x= 0; x < 3; x++)
   {
     rc= memcached_set(memc, keys[x], key_length[x], 
@@ -917,16 +915,13 @@ uint8_t user_supplied_bug4(memcached_st *memc)
     assert(rc == MEMCACHED_NO_SERVERS);
   }
 
-  WATCHPOINT;
   rc= memcached_mget(memc, keys, key_length, 3);
   assert(rc == MEMCACHED_NO_SERVERS);
-  WATCHPOINT;
 
   x= 0;
   while ((return_value= memcached_fetch(memc, return_key, &return_key_length, 
                                         &return_value_length, &flags, &rc)))
   {
-    WATCHPOINT;
     assert(return_value);
     assert(rc == MEMCACHED_SUCCESS);
     assert(return_key_length == return_value_length);
diff --git a/tests/output.res b/tests/output.res
index c7b64b5c..a81bf7af 100644
--- a/tests/output.res
+++ b/tests/output.res
@@ -29,6 +29,7 @@ Error 24 -> STAT VALUE
 Error 25 -> SYSTEM ERROR
 Error 26 -> COULD NOT OPEN UNIX SOCKET
 Error 27 -> ACTION NOT SUPPORTED
+Error 28 -> A KEY LENGTH OF ZERO WAS PROVIDED
 Found key pid
 Found key uptime
 Found key time
@@ -135,6 +136,7 @@ Error 24 -> STAT VALUE
 Error 25 -> SYSTEM ERROR
 Error 26 -> COULD NOT OPEN UNIX SOCKET
 Error 27 -> ACTION NOT SUPPORTED
+Error 28 -> A KEY LENGTH OF ZERO WAS PROVIDED
 Found key pid
 Found key uptime
 Found key time
@@ -241,6 +243,7 @@ Error 24 -> STAT VALUE
 Error 25 -> SYSTEM ERROR
 Error 26 -> COULD NOT OPEN UNIX SOCKET
 Error 27 -> ACTION NOT SUPPORTED
+Error 28 -> A KEY LENGTH OF ZERO WAS PROVIDED
 Found key pid
 Found key uptime
 Found key time
@@ -347,6 +350,7 @@ Error 24 -> STAT VALUE
 Error 25 -> SYSTEM ERROR
 Error 26 -> COULD NOT OPEN UNIX SOCKET
 Error 27 -> ACTION NOT SUPPORTED
+Error 28 -> A KEY LENGTH OF ZERO WAS PROVIDED
 Found key pid
 Found key uptime
 Found key time
@@ -453,6 +457,7 @@ Error 24 -> STAT VALUE
 Error 25 -> SYSTEM ERROR
 Error 26 -> COULD NOT OPEN UNIX SOCKET
 Error 27 -> ACTION NOT SUPPORTED
+Error 28 -> A KEY LENGTH OF ZERO WAS PROVIDED
 Found key pid
 Found key uptime
 Found key time
@@ -559,6 +564,7 @@ Error 24 -> STAT VALUE
 Error 25 -> SYSTEM ERROR
 Error 26 -> COULD NOT OPEN UNIX SOCKET
 Error 27 -> ACTION NOT SUPPORTED
+Error 28 -> A KEY LENGTH OF ZERO WAS PROVIDED
 Found key pid
 Found key uptime
 Found key time
@@ -665,6 +671,7 @@ Error 24 -> STAT VALUE
 Error 25 -> SYSTEM ERROR
 Error 26 -> COULD NOT OPEN UNIX SOCKET
 Error 27 -> ACTION NOT SUPPORTED
+Error 28 -> A KEY LENGTH OF ZERO WAS PROVIDED
 Found key pid
 Found key uptime
 Found key time
@@ -771,6 +778,7 @@ Error 24 -> STAT VALUE
 Error 25 -> SYSTEM ERROR
 Error 26 -> COULD NOT OPEN UNIX SOCKET
 Error 27 -> ACTION NOT SUPPORTED
+Error 28 -> A KEY LENGTH OF ZERO WAS PROVIDED
 Found key pid
 Found key uptime
 Found key time
@@ -877,6 +885,7 @@ Error 24 -> STAT VALUE
 Error 25 -> SYSTEM ERROR
 Error 26 -> COULD NOT OPEN UNIX SOCKET
 Error 27 -> ACTION NOT SUPPORTED
+Error 28 -> A KEY LENGTH OF ZERO WAS PROVIDED
 Found key pid
 Found key uptime
 Found key time
@@ -983,6 +992,7 @@ Error 24 -> STAT VALUE
 Error 25 -> SYSTEM ERROR
 Error 26 -> COULD NOT OPEN UNIX SOCKET
 Error 27 -> ACTION NOT SUPPORTED
+Error 28 -> A KEY LENGTH OF ZERO WAS PROVIDED
 Found key pid
 Found key uptime
 Found key time
@@ -1089,6 +1099,7 @@ Error 24 -> STAT VALUE
 Error 25 -> SYSTEM ERROR
 Error 26 -> COULD NOT OPEN UNIX SOCKET
 Error 27 -> ACTION NOT SUPPORTED
+Error 28 -> A KEY LENGTH OF ZERO WAS PROVIDED
 Found key pid
 Found key uptime
 Found key time
diff --git a/tests/t/memslap.test b/tests/t/memslap.test
index 999eac0a..cc4ea80f 100644
--- a/tests/t/memslap.test
+++ b/tests/t/memslap.test
@@ -1,3 +1,5 @@
 MEMSLAP="../src/memslap"
 
 $MEMSLAP --help
+
+$MEMSLAP --servers=localhost --initial-load=5000 --verbose --flush --concurrency=500 --execute-number=500 > /dev/null
-- 
2.30.2