Merge in fixes for SASL.

[awesomized/libmemcached] / libtest / unittest.cc

diff --git a/libtest/unittest.cc b/libtest/unittest.cc
index e3272783ca2094b4fc745a7591f349c59e06a920..d2c965bac504641e3b042abab78041f3219855ef 100644 (file)
--- a/libtest/unittest.cc
+++ b/libtest/unittest.cc
@@ -113,28 +113,88 @@ static test_return_t local_not_test(void *)
   return TEST_SUCCESS;
 }
 
-#if 0
-static test_return_t pause_test(void *)
+static test_return_t var_exists_test(void *)
 {
-  (void)getchar();
+  test_compare(0, access("var", R_OK | W_OK | X_OK));
+  return TEST_SUCCESS;
+}
+
+static test_return_t var_tmp_exists_test(void *)
+{
+  test_compare(0, access("var/tmp", R_OK | W_OK | X_OK));
+  return TEST_SUCCESS;
+}
+
+static test_return_t var_run_exists_test(void *)
+{
+  test_compare(0, access("var/run", R_OK | W_OK | X_OK));
+  return TEST_SUCCESS;
+}
+
+static test_return_t var_log_exists_test(void *)
+{
+  test_compare(0, access("var/log", R_OK | W_OK | X_OK));
+  return TEST_SUCCESS;
+}
+
+static test_return_t var_tmp_test(void *)
+{
+  FILE *file= fopen("var/tmp/junk", "w+");
+  char buffer[1024];
+  const char *dir= getcwd(buffer, sizeof(buffer));
+  test_true_got(file, dir);
+  fclose(file);
+  return TEST_SUCCESS;
+}
+
+static test_return_t var_run_test(void *)
+{
+  FILE *file= fopen("var/run/junk", "w+");
+  test_true(file);
+  fclose(file);
+  return TEST_SUCCESS;
+}
+
+static test_return_t var_log_test(void *)
+{
+  FILE *file= fopen("var/log/junk", "w+");
+  test_true(file);
+  fclose(file);
+  return TEST_SUCCESS;
+}
+
+static test_return_t var_tmp_rm_test(void *)
+{
+  test_true(unlink("var/tmp/junk") == 0);
+  return TEST_SUCCESS;
+}
+
+static test_return_t var_run_rm_test(void *)
+{
+  test_true(unlink("var/run/junk") == 0);
   return TEST_SUCCESS;
 }
-#endif
 
+static test_return_t var_log_rm_test(void *)
+{
+  test_true(unlink("var/log/junk") == 0);
+  return TEST_SUCCESS;
+}
 
 static test_return_t gearmand_cycle_test(void *object)
 {
   server_startup_st *servers= (server_startup_st*)object;
   test_true(servers);
 
-#ifndef HAVE_LIBGEARMAN
-  return TEST_SKIPPED;
-#endif
+  if (HAVE_LIBGEARMAN)
+  {
+    const char *argv[1]= { "cycle_gearmand" };
+    test_true(server_startup(*servers, "gearmand", 9999, 1, argv));
 
-  const char *argv[1]= { "cycle_gearmand" };
-  test_true(server_startup(*servers, "gearmand", 9999, 1, argv));
+    return TEST_SUCCESS;
+  }
 
-  return TEST_SUCCESS;
+  return TEST_SKIPPED;
 }
 
 static test_return_t memcached_cycle_test(void *object)
@@ -142,14 +202,15 @@ static test_return_t memcached_cycle_test(void *object)
   server_startup_st *servers= (server_startup_st*)object;
   test_true(servers);
 
-#if !defined(MEMCACHED_BINARY) || !defined(HAVE_LIBMEMCACHED)
-  return TEST_SKIPPED;
-#endif
+  if (MEMCACHED_BINARY and HAVE_LIBMEMCACHED) 
+  {
+    const char *argv[1]= { "cycle_memcached" };
+    test_true(server_startup(*servers, "memcached", 9998, 1, argv));
 
-  const char *argv[1]= { "cycle_memcached" };
-  test_true(server_startup(*servers, "memcached", 9998, 1, argv));
+    return TEST_SUCCESS;
+  }
 
-  return TEST_SUCCESS;
+  return TEST_SKIPPED;
 }
 
 static test_return_t memcached_socket_cycle_test(void *object)
@@ -157,14 +218,15 @@ static test_return_t memcached_socket_cycle_test(void *object)
   server_startup_st *servers= (server_startup_st*)object;
   test_true(servers);
 
-#if !defined(MEMCACHED_BINARY) || !defined(HAVE_LIBMEMCACHED)
-  return TEST_SKIPPED;
-#endif
+  if (MEMCACHED_BINARY and HAVE_LIBMEMCACHED)
+  {
+    const char *argv[1]= { "cycle_memcached" };
+    test_true(servers->start_socket_server("memcached", 9997, 1, argv));
 
-  const char *argv[1]= { "cycle_memcached" };
-  test_true(servers->start_socket_server("memcached", 9997, 1, argv));
+    return TEST_SUCCESS;
+  }
 
-  return TEST_SUCCESS;
+  return TEST_SKIPPED;
 }
 
 test_st gearmand_tests[] ={
@@ -201,10 +263,25 @@ test_st local_log[] ={
   {0, 0, 0}
 };
 
+test_st directories_tests[] ={
+  {"var exists", 0, var_exists_test },
+  {"var/tmp exists", 0, var_tmp_exists_test },
+  {"var/run exists", 0, var_run_exists_test },
+  {"var/log exists", 0, var_log_exists_test },
+  {"var/tmp", 0, var_tmp_test },
+  {"var/run", 0, var_run_test },
+  {"var/log", 0, var_log_test },
+  {"var/tmp rm", 0, var_tmp_rm_test },
+  {"var/run rm", 0, var_run_rm_test },
+  {"var/log rm", 0, var_log_rm_test },
+  {0, 0, 0}
+};
+
 collection_st collection[] ={
   {"environment", 0, 0, environment_tests},
   {"return values", 0, 0, tests_log},
   {"local", 0, 0, local_log},
+  {"directories", 0, 0, directories_tests},
   {"gearmand", 0, 0, gearmand_tests},
   {"memcached", 0, 0, memcached_tests},
   {0, 0, 0, 0}