Remove final flush logic

[m6w6/libmemcached] / libtest / framework.cc

diff --git a/libtest/framework.cc b/libtest/framework.cc
index ff67f20b63b2306da620868f0b7409cceabc1806..73e227e429be74b9788a7db0af3248eb28e3f1b0 100644 (file)
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -1,19 +1,59 @@
-/* uTest Copyright (C) 2011 Data Differential, http://datadifferential.com/
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  libtest
  *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+
+#include <config.h>
 #include <libtest/common.h>
+#include <iostream>
 
-test_return_t Framework::destroy(void* arg)
+using namespace libtest;
+
+static test_return_t _default_callback(void*)
 {
-  if (_destroy)
+  return TEST_SUCCESS;
+}
+
+Framework::Framework() :
+  collections(NULL),
+  _create(NULL),
+  _destroy(NULL),
+  collection_startup(_default_callback),
+  collection_shutdown(_default_callback),
+  _on_error(NULL),
+  _runner(NULL),
+  _socket(false),
+  _creators_ptr(NULL)
+{
+}
+
+Framework::~Framework()
+{
+  if (_destroy and _destroy(_creators_ptr))
   {
-    return _destroy(arg);
+    Error << "Failure in _destroy(), some resources may not have been cleaned up.";
   }
 
-  return TEST_SUCCESS;
+  _servers.shutdown();
+
+  delete _runner;
 }
 
 test_return_t Framework::Item::flush(void* arg, test_st* run)
@@ -55,3 +95,25 @@ test_return_t Framework::Item::startup(void* arg)
 
   return TEST_SUCCESS;
 }
+
+libtest::Runner *Framework::runner()
+{
+  if (_runner == NULL)
+  {
+    _runner= new Runner;
+  }
+  _runner->set_servers(_servers);
+
+  return _runner;
+}
+
+void* Framework::create(test_return_t& arg)
+{
+  arg= TEST_SUCCESS;
+  if (_create)
+  {
+    return _creators_ptr= _create(_servers, arg);
+  }
+
+  return NULL;
+}