X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fframework.h;h=04dc29da89be2ef5a5c93cab75450fa509c4658f;hb=5fb9e63a9f6af5fca174939f7c5fffa360ad75d0;hp=69941b1bc8faaf1e62aaf054406b45678b30681d;hpb=ad94287c37250fcb1f7881705f0effb37bae7da5;p=m6w6%2Flibmemcached

diff --git a/libtest/framework.h b/libtest/framework.h
index 69941b1b..04dc29da 100644
--- a/libtest/framework.h
+++ b/libtest/framework.h
@@ -80,20 +80,11 @@ public:
     */
     test_callback_fn *_flush;
 
-  private:
-    /*
-       Run before and after the runnner is executed.
-    */
-    test_callback_fn *pre_run;
-    test_callback_fn *post_run;
-
   public:
 
     Item() :
       _startup(NULL),
-      _flush(NULL),
-      pre_run(NULL),
-      post_run(NULL)
+      _flush(NULL)
     { }
 
     void set_startup(test_callback_fn *arg)
@@ -111,19 +102,7 @@ public:
       _flush= arg;
     }
 
-    void set_pre(test_callback_fn *arg)
-    {
-      pre_run= arg;
-    }
-
-    void set_post(test_callback_fn *arg)
-    {
-      pre_run= arg;
-    }
-
-    test_return_t pre(void *arg);
     test_return_t flush(void* arg, test_st* run);
-    test_return_t post(void *arg);
 
   } item;
 
@@ -143,6 +122,16 @@ public:
   {
     _servers.set_socket();
   }
+
+  void set_sasl(const std::string& username_arg, const std::string& password_arg)
+  {
+    _servers.set_sasl(username_arg, password_arg);
+  }
+
+  libtest::server_startup_st& servers()
+  {
+    return _servers;
+  }
   
   /**
     Runner represents the callers for the tests. If not implemented we will use
@@ -169,4 +158,5 @@ private:
   libtest::server_startup_st _servers;
   bool _socket;
   void *_creators_ptr;
+  unsigned long int _servers_to_run;
 };