X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Funittest.cc;h=ff73aa40c251756c5cc69bcbd380dc2c55d2097f;hb=9ba1b97bd2990ff7d8a83c03efc5e73c0e4d6e8a;hp=f884af33483812434df32e002127938b3a863a5a;hpb=941deb278c78654f9cfeda6f343c79e2f10b746a;p=m6w6%2Flibmemcached diff --git a/libtest/unittest.cc b/libtest/unittest.cc index f884af33..ff73aa40 100644 --- a/libtest/unittest.cc +++ b/libtest/unittest.cc @@ -1,25 +1,39 @@ /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * libtest * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Data Differential YATL (i.e. libtest) library * - * 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. + * Copyright (C) 2012 Data Differential, http://datadifferential.com/ * - * 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. + * 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. * - * 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 #include @@ -164,8 +178,7 @@ 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); + test_true(file); fclose(file); return TEST_SUCCESS; } @@ -251,10 +264,10 @@ static test_return_t drizzled_cycle_test(void *object) test_true(servers and servers->validate()); #if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY - test_true(has_drizzled_binary()); + test_true(has_drizzled()); #endif - test_skip(true, has_drizzled_binary()); + test_skip(true, has_drizzled()); test_true(server_startup(*servers, "drizzled", get_free_port(), 0, NULL)); @@ -267,10 +280,10 @@ static test_return_t gearmand_cycle_test(void *object) test_true(servers and servers->validate()); #if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY - test_true(has_gearmand_binary()); + test_true(has_gearmand()); #endif - test_skip(true, has_gearmand_binary()); + test_skip(true, has_gearmand()); test_true(server_startup(*servers, "gearmand", get_free_port(), 0, NULL)); @@ -319,7 +332,7 @@ static test_return_t memcached_cycle_test(void *object) if (MEMCACHED_BINARY and HAVE_LIBMEMCACHED) { - test_true(has_memcached_binary()); + test_true(has_memcached()); test_true(server_startup(*servers, "memcached", get_free_port(), 0, NULL)); return TEST_SUCCESS; @@ -337,7 +350,7 @@ static test_return_t memcached_socket_cycle_test(void *object) { if (HAVE_LIBMEMCACHED) { - test_true(has_memcached_binary()); + test_true(has_memcached()); test_true(servers->start_socket_server("memcached", get_free_port(), 0, NULL)); return TEST_SUCCESS; @@ -358,7 +371,7 @@ static test_return_t memcached_sasl_test(void *object) { if (HAVE_LIBMEMCACHED) { - test_true(has_memcached_sasl_binary()); + test_true(has_memcached_sasl()); test_true(server_startup(*servers, "memcached-sasl", get_free_port(), 0, NULL)); return TEST_SUCCESS; @@ -682,7 +695,7 @@ static test_return_t gdb_abort_services_appliction_TEST(void *) static test_return_t get_free_port_TEST(void *) { in_port_t ret_port; - test_true_hint((ret_port= get_free_port()), ret_port); + test_true((ret_port= get_free_port())); test_true(get_free_port() != default_port()); test_true(get_free_port() != get_free_port()); @@ -706,6 +719,30 @@ static test_return_t number_of_cpus_TEST(void *) return TEST_SUCCESS; } +static test_return_t check_dns_TEST(void *) +{ + test_warn(libtest::check_dns(), "Broken DNS server/no DNS server found"); + + return TEST_SUCCESS; +} + +static test_return_t lookup_true_TEST(void *) +{ + test_warn(libtest::lookup("exist.gearman.info"), "dns is not currently working"); + return TEST_SUCCESS; +} + +static test_return_t lookup_false_TEST(void *) +{ + if (libtest::lookup("does_not_exist.gearman.info")) + { + Error << "Broken DNS server detected"; + return TEST_SKIPPED; + } + + return TEST_SUCCESS; +} + static test_return_t create_tmpfile_TEST(void *) { std::string tmp= create_tmpfile(__func__); @@ -717,8 +754,8 @@ static test_return_t create_tmpfile_TEST(void *) test_compare(Application::SUCCESS, touch_app.run(args)); test_compare(Application::SUCCESS, touch_app.wait(false)); - test_compare_hint(0, access(tmp.c_str(), R_OK), strerror(errno)); - test_compare_hint(0, unlink(tmp.c_str()), strerror(errno)); + test_compare(0, access(tmp.c_str(), R_OK)); + test_compare(0, unlink(tmp.c_str())); return TEST_SUCCESS; } @@ -743,14 +780,14 @@ static test_return_t default_port_TEST(void *) static test_return_t check_for_gearman(void *) { test_skip(true, HAVE_LIBGEARMAN); - test_skip(true, has_gearmand_binary()); + test_skip(true, has_gearmand()); return TEST_SUCCESS; } static test_return_t check_for_drizzle(void *) { test_skip(true, HAVE_LIBDRIZZLE); - test_skip(true, has_drizzled_binary()); + test_skip(true, has_drizzled()); return TEST_SUCCESS; } @@ -772,7 +809,7 @@ test_st gearmand_tests[] ={ static test_return_t check_for_libmemcached(void *) { test_skip(true, HAVE_LIBMEMCACHED); - test_skip(true, has_memcached_binary()); + test_skip(true, has_memcached()); return TEST_SUCCESS; } @@ -871,6 +908,13 @@ test_st create_tmpfile_TESTS[] ={ {0, 0, 0} }; +test_st dns_TESTS[] ={ + {"libtest::lookup(true)", 0, lookup_true_TEST }, + {"libtest::lookup(false)", 0, lookup_false_TEST }, + {"libtest::check_dns()", 0, check_dns_TEST }, + {0, 0, 0} +}; + test_st application_tests[] ={ {"vchar_t", 0, vchar_t_TEST }, {"vchar_t compare()", 0, vchar_t_compare_neg_TEST }, @@ -929,6 +973,7 @@ collection_st collection[] ={ {"fatal", disable_fatal_exception, enable_fatal_exception, fatal_message_TESTS }, {"number_of_cpus()", 0, 0, number_of_cpus_TESTS }, {"create_tmpfile()", 0, 0, create_tmpfile_TESTS }, + {"dns", 0, 0, dns_TESTS }, {0, 0, 0, 0} }; @@ -939,6 +984,6 @@ static void *world_create(server_startup_st& servers, test_return_t&) void get_world(Framework *world) { - world->collections= collection; - world->_create= world_create; + world->collections(collection); + world->create(world_create); }