X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached_world.h;h=4092d95104773c9930c151e4d4b4c34cb31db952;hb=f5c167f523682cb08109842ce010b29e80fdf63d;hp=c26323119b35696044d2e13f94ffc0d0dc23a521;hpb=a246ac50a88e4af750fd2dd209eff94dcadf72d2;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index c2632311..4092d951 100644
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -4,7 +4,7 @@
  *
  * Use and distribution licensed under the BSD license.  See
  * the COPYING file in the parent directory for full text.
- * 
+ *
  * Description: This is the startup bits for any libmemcached test.
  *
  */
@@ -17,12 +17,13 @@ extern "C" {
 typedef struct
 {
   server_startup_st construct;
+  memcached_st *parent;
   memcached_st *memc;
 } libmemcached_test_container_st;
 
 /* Prototypes for functions we will pass to test framework */
-libmemcached_test_container_st *world_create(void);
-test_return_t world_collection_startup(libmemcached_test_container_st *);
+libmemcached_test_container_st *world_create(test_return_t *error);
+test_return_t world_test_startup(libmemcached_test_container_st *);
 test_return_t world_flush(libmemcached_test_container_st *container);
 test_return_t world_pre_run(libmemcached_test_container_st *);
 
@@ -32,31 +33,59 @@ test_return_t world_destroy(libmemcached_test_container_st *);
 
 static libmemcached_test_container_st global_container;
 
-libmemcached_test_container_st *world_create(void)
+/**
+  @note generic shutdown/startup for libmemcached tests.
+*/
+test_return_t world_container_startup(libmemcached_test_container_st *container);
+test_return_t world_container_shutdown(libmemcached_test_container_st *container);
+
+libmemcached_test_container_st *world_create(test_return_t *error)
 {
   memset(&global_container, 0, sizeof(global_container));
   global_container.construct.count= SERVERS_TO_CREATE;
   global_container.construct.udp= 0;
   server_startup(&global_container.construct);
 
-  assert(global_container.construct.servers);
+  if (! global_container.construct.servers)
+  {
+    *error= TEST_FAILURE;
+    server_shutdown(&global_container.construct);
+    return NULL;
+  }
+
+  *error= TEST_SUCCESS;
 
   return &global_container;
 }
 
-
-test_return_t world_collection_startup(libmemcached_test_container_st *container)
+test_return_t world_container_startup(libmemcached_test_container_st *container)
 {
   memcached_return_t rc;
-  container->memc= memcached_create(NULL);
-  test_truth((container->memc != NULL));
+  container->parent= memcached_create(NULL);
+  test_truth((container->parent != NULL));
 
-  rc= memcached_server_push(container->memc, container->construct.servers);
+  rc= memcached_server_push(container->parent, container->construct.servers);
   test_truth(rc == MEMCACHED_SUCCESS);
 
   return TEST_SUCCESS;
 }
 
+test_return_t world_container_shutdown(libmemcached_test_container_st *container)
+{
+  memcached_free(container->parent);
+  container->parent= NULL;
+
+  return TEST_SUCCESS;
+}
+
+test_return_t world_test_startup(libmemcached_test_container_st *container)
+{
+  container->memc= memcached_clone(NULL, container->parent);
+  test_truth((container->memc != NULL));
+
+  return TEST_SUCCESS;
+}
+
 test_return_t world_flush(libmemcached_test_container_st *container)
 {
   memcached_flush(container->memc, 0);
@@ -90,7 +119,8 @@ test_return_t world_on_error(test_return_t test_state, libmemcached_test_contain
 {
   (void)test_state;
   memcached_free(container->memc);
-  
+  container->memc= NULL;
+
   return TEST_SUCCESS;
 }