diff options
author | Brian Aker <brian@tangent.org> | 2012-02-16 18:39:27 -0800 |
---|---|---|
committer | Brian Aker <brian@tangent.org> | 2012-02-16 18:39:27 -0800 |
commit | 751e342e158ae65052ce098ccd64aa54e39312db (patch) | |
tree | 8b74445ef834c05606f0222a31ffa67fbdb884bc /tests/memrm.cc | |
parent | fabf488ffa687540145ca8973ceb3fb0147a858b (diff) | |
download | libmemcached-751e342e158ae65052ce098ccd64aa54e39312db.tar.gz |
Update libtest/associated tests.
Diffstat (limited to 'tests/memrm.cc')
-rw-r--r-- | tests/memrm.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/memrm.cc b/tests/memrm.cc index f3a1f84b..382693cd 100644 --- a/tests/memrm.cc +++ b/tests/memrm.cc @@ -56,15 +56,16 @@ static test_return_t quiet_test(void *) { const char *args[]= { "--quiet", 0 }; - test_true(exec_cmdline(executable, args)); + test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true)); return TEST_SUCCESS; } static test_return_t help_test(void *) { - const char *args[]= { "--quiet", "--help", 0 }; + const char *args[]= { "--help", 0 }; + + test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true)); - test_true(exec_cmdline(executable, args)); return TEST_SUCCESS; } @@ -72,7 +73,6 @@ static test_return_t rm_test(void *) { char buffer[1024]; snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port())); - const char *args[]= { "--quiet", buffer, "foo", 0 }; memcached_st *memc= memcached(buffer, strlen(buffer)); test_true(memc); @@ -84,7 +84,8 @@ static test_return_t rm_test(void *) test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc)); test_compare(MEMCACHED_SUCCESS, rc); - test_true(exec_cmdline(executable, args)); + const char *args[]= { buffer, "foo", 0 }; + test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true)); test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc)); test_compare(MEMCACHED_NOTFOUND, rc); @@ -98,7 +99,7 @@ static test_return_t NOT_FOUND_test(void *) { char buffer[1024]; snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port())); - const char *args[]= { "--quiet", buffer, "foo", 0 }; + const char *args[]= { buffer, "foo", 0 }; memcached_st *memc= memcached(buffer, strlen(buffer)); test_true(memc); @@ -107,7 +108,7 @@ static test_return_t NOT_FOUND_test(void *) test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc)); test_compare(MEMCACHED_NOTFOUND, rc); - test_true(exec_cmdline(executable, args)); + test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true)); test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc)); test_compare(MEMCACHED_NOTFOUND, rc); |