Update yatl.

[awesomized/libmemcached] / tests / runner.h

diff --git a/tests/runner.h b/tests/runner.h
index a4b1512d62a8e7ebf4dbc7925012e2b2449bf2f5..17bf55a62ad7214b9fd889ebc1a3e63d48a59399 100644 (file)
--- a/tests/runner.h
+++ b/tests/runner.h
@@ -39,7 +39,8 @@
 #pragma once
 
 #include "tests/libmemcached-1.0/generate.h"
-#include "tests/memc.h"
+#include "tests/memc.hpp"
+#include "tests/print.h"
 
 class LibmemcachedRunner : public libtest::Runner {
 public:
@@ -55,7 +56,7 @@ public:
 
   test_return_t flush(libmemcached_test_container_st *container)
   {
-    Memc memc(container->parent());
+    test::Memc memc(container->parent());
     memcached_flush(&memc, 0);
     memcached_quit(&memc);
 
@@ -77,7 +78,7 @@ private:
   {
     test_true(container);
     test_true(container->parent());
-    Memc memc(container->parent());
+    test::Memc memc(container->parent());
 
     test_compare(true, check());
 
@@ -85,14 +86,7 @@ private:
     if (func)
     {
       test_true(container);
-      try {
-        ret= func(&memc);
-      }
-      catch (std::exception& e)
-      {
-        libtest::Error << e.what();
-        ret= TEST_FAILURE;
-      }
+      ret= func(&memc);
     }
 
     return ret;
@@ -104,15 +98,16 @@ private:
     {
       char buffer[BUFSIZ];
 
-      test_compare_got(MEMCACHED_SUCCESS,
-                       libmemcached_check_configuration(container->construct.option_string().c_str(), container->construct.option_string().size(),
-                                                        buffer, sizeof(buffer)),
-                       container->construct.option_string().c_str());
+      test_compare(MEMCACHED_SUCCESS,
+                   libmemcached_check_configuration(container->construct.option_string().c_str(), container->construct.option_string().size(),
+                                                    buffer, sizeof(buffer)));
 
       test_null(container->parent());
       container->parent(memcached(container->construct.option_string().c_str(), container->construct.option_string().size()));
       test_true(container->parent());
+#if 0
       test_compare(MEMCACHED_SUCCESS, memcached_version(container->parent()));
+#endif
 
       if (container->construct.sasl())
       {