projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Additions to testing to better check return values/etc for servers.
[awesomized/libmemcached]
/
tests
/
memflush.cc
diff --git
a/tests/memflush.cc
b/tests/memflush.cc
index 8f91356c2b4714320decdfea9296fc9478ec1e81..d1184722c64f4749e4ba0ab001f653d9f4e67247 100644
(file)
--- a/
tests/memflush.cc
+++ b/
tests/memflush.cc
@@
-56,15
+56,17
@@
static test_return_t quiet_test(void *)
{
const char *args[]= { "--quiet", 0 };
{
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 *)
{
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;
}
return TEST_SUCCESS;
}
@@
-72,9
+74,10
@@
static test_return_t server_test(void *)
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
- const char *args[]= { "--quiet", buffer, 0 };
+ const char *args[]= { buffer, 0 };
+
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
- test_true(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-94,12
+97,12
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
{
if (HAVE_MEMCACHED_BINARY == 0)
{
{
if (HAVE_MEMCACHED_BINARY == 0)
{
- error= TEST_
FATAL
;
+ error= TEST_
SKIPPED
;
return NULL;
}
const char *argv[1]= { "memflush" };
return NULL;
}
const char *argv[1]= { "memflush" };
- if (not server_startup(servers, "memcached",
MEMCACHED_DEFAULT_PORT +10
, 1, argv))
+ if (not server_startup(servers, "memcached",
libtest::default_port()
, 1, argv))
{
error= TEST_FAILURE;
}
{
error= TEST_FAILURE;
}