From 9ba1b97bd2990ff7d8a83c03efc5e73c0e4d6e8a Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Sat, 30 Jun 2012 09:55:09 -0700 Subject: [PATCH] Update unittest --- libtest/memcached.hpp.moved | 70 ------------------------------------- libtest/unittest.cc | 41 +++++++++++++++++++--- 2 files changed, 36 insertions(+), 75 deletions(-) delete mode 100644 libtest/memcached.hpp.moved diff --git a/libtest/memcached.hpp.moved b/libtest/memcached.hpp.moved deleted file mode 100644 index c4953975..00000000 --- a/libtest/memcached.hpp.moved +++ /dev/null @@ -1,70 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Data Differential YATL (i.e. libtest) library - * - * Copyright (C) 2012 Data Differential, http://datadifferential.com/ - * - * 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. - * - */ - -#pragma once - -#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED -inline bool operator== (const memcached_st& memc, const memcached_return_t rc) -{ - if (memcached_last_error(&memc) == rc) - { - return true; - } - - return false; -} - -inline bool operator!= (const memcached_st& memc, const memcached_return_t rc) -{ - if (memcached_last_error(&memc) != rc) - { - return true; - } - - return false; -} - -inline bool operator!= (const memcached_return_t rc, const memcached_st& memc) -{ - if (memcached_last_error(&memc) != rc) - { - return true; - } - - return false; -} -#endif - diff --git a/libtest/unittest.cc b/libtest/unittest.cc index 56df76ba..ff73aa40 100644 --- a/libtest/unittest.cc +++ b/libtest/unittest.cc @@ -178,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; } @@ -696,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()); @@ -720,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__); @@ -731,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; } @@ -885,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 }, @@ -943,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} }; -- 2.30.2