Brian Aker 12 лет назад
Родитель
Сommit
abd2911504
6 измененных файлов с 196 добавлено и 1 удалено
  1. 1 0
      .bzrignore
  2. 10 1
      libtest/has.cc
  3. 2 0
      libtest/has.hpp
  4. 1 0
      tests/include.am
  5. 35 0
      tests/mysql.am
  6. 147 0
      tests/mysql_test.cc

+ 1 - 0
.bzrignore

@@ -136,3 +136,4 @@ util/.hg/
 util/.hgignore
 var
 tests/stress_test
+tests/mysql_test

+ 10 - 1
libtest/has.cc

@@ -63,7 +63,6 @@ bool has_postgres_support(void)
 {
   if (getenv("POSTGES_IS_RUNNING_AND_SETUP"))
   {
-
     if (HAVE_LIBPQ)
     {
       return true;
@@ -72,3 +71,13 @@ bool has_postgres_support(void)
 
   return false;
 }
+
+bool has_mysql_support(void)
+{
+  if (HAVE_MYSQL_BUILD)
+  {
+    return true;
+  }
+
+  return false;
+}

+ 2 - 0
libtest/has.hpp

@@ -41,3 +41,5 @@ bool has_memcached_support(void);
 bool has_drizzle_support(void);
 
 bool has_postgres_support(void);
+
+bool has_mysql_support(void);

+ 1 - 0
tests/include.am

@@ -229,6 +229,7 @@ include tests/ephemeral.am
 include tests/libdrizzle.am
 include tests/libmemcached.am
 include tests/postgres.am
+include tests/mysql.am
 include tests/sqlite.am
 include tests/tokyocabinet.am
 include tests/redis.am

+ 35 - 0
tests/mysql.am

@@ -0,0 +1,35 @@
+# vim:ft=automake
+# Gearman server and library
+# Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
+# All rights reserved.
+#
+# Use and distribution licensed under the BSD license.  See
+# the COPYING file in the parent directory for full text.
+#
+# Included from Top Level Makefile.am
+# All paths should be given relative to the root
+#
+
+test-mysql: tests/mysql_test gearmand/gearmand
+	@tests/mysql_test
+
+gdb-mysql: tests/mysql_test gearmand/gearmand
+	@$(GDB_COMMAND) tests/mysql_test
+
+valgrind-mysql: tests/mysql_test gearmand/gearmand
+	@$(VALGRIND_COMMAND) tests/mysql_test
+
+tests_mysql_test_SOURCES=
+tests_mysql_test_CXXFLAGS=
+tests_mysql_test_DEPENDENCIES=
+tests_mysql_test_LDADD=
+
+tests_mysql_test_SOURCES+= tests/basic.cc
+tests_mysql_test_SOURCES+= tests/mysql_test.cc
+
+tests_mysql_test_DEPENDENCIES+= ${CLIENT_LDADD}
+tests_mysql_test_DEPENDENCIES+= gearmand/gearmand
+tests_mysql_test_LDADD+= ${CLIENT_LDADD}
+
+check_PROGRAMS += tests/mysql_test
+noinst_PROGRAMS += tests/mysql_test

+ 147 - 0
tests/mysql_test.cc

@@ -0,0 +1,147 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Gearmand client and server library.
+ *
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2008 Brian Aker, Eric Day
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+
+#include <config.h>
+#include <libtest/test.hpp>
+
+using namespace libtest;
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <unistd.h>
+
+#include <libgearman/gearman.h>
+
+#include <tests/basic.h>
+#include <tests/context.h>
+
+#ifndef __INTEL_COMPILER
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+
+static test_return_t gearmand_basic_option_test(void *)
+{
+  const char *args[]= { "--check-args",
+    "--queue-type=MySQL",
+    "--mysql-host=localhost",
+    "--mysql-user=mysql",
+    "--mysql-password=mysql",
+    "--mysql-db=gearman",
+    "--mysql-table=gearman",
+    0 };
+
+  test_compare(EXIT_SUCCESS, exec_cmdline(gearmand_binary(), args, true));
+
+  return TEST_SUCCESS;
+}
+
+static test_return_t collection_init(void *object)
+{
+  return TEST_SKIPPED; // Just skip until YaTL has MySQL startup support
+
+  const char *argv[]= {
+    "--queue-type=MySQL",
+    "--mysql-table=gearman",
+    0 };
+
+  Context *test= (Context *)object;
+  fatal_assert(test);
+
+  test_truth(test->initialize(2, argv));
+
+  return TEST_SUCCESS;
+}
+
+static test_return_t collection_cleanup(void *object)
+{
+  Context *test= (Context *)object;
+  test->reset();
+
+  return TEST_SUCCESS;
+}
+
+
+static void *world_create(server_startup_st& servers, test_return_t& error)
+{
+  if (has_mysql_support() == false)
+  {
+    error= TEST_SKIPPED;
+    return NULL;
+  }
+
+  return new Context(default_port(), servers);
+}
+
+static bool world_destroy(void *object)
+{
+  Context *test= (Context *)object;
+
+  delete test;
+
+  return TEST_SUCCESS;
+}
+
+test_st gearmand_basic_option_tests[] ={
+  {"all options", 0, gearmand_basic_option_test },
+  {0, 0, 0}
+};
+
+test_st tests[] ={
+  {"gearman_client_echo()", 0, client_echo_test },
+  {"gearman_client_echo() fail", 0, client_echo_fail_test },
+  {"gearman_worker_echo()", 0, worker_echo_test },
+  {"clean", 0, queue_clean },
+  {"add", 0, queue_add },
+  {"worker", 0, queue_worker },
+  {0, 0, 0}
+};
+
+collection_st collection[] ={
+  {"gearmand options", 0, 0, gearmand_basic_option_tests},
+  {"mysql queue", collection_init, collection_cleanup, tests},
+  {0, 0, 0, 0}
+};
+
+void get_world(Framework *world)
+{
+  world->collections(collection);
+  world->create(world_create);
+  world->destroy(world_destroy);
+}