projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Don't create XAPI cache at install.
[openvswitch]
/
tests
/
test-vconn.c
diff --git
a/tests/test-vconn.c
b/tests/test-vconn.c
index f12e378fca41e71c29b2263be07de0c406794ae2..12b69ca0bff41ce5a75e7e97a444e6f0bf2590d3 100644
(file)
--- a/
tests/test-vconn.c
+++ b/
tests/test-vconn.c
@@
-134,14
+134,16
@@
fpv_destroy(struct fake_pvconn *fpv)
/* Connects to a fake_pvconn with vconn_open(), then closes the listener and
* verifies that vconn_connect() reports 'expected_error'. */
static void
/* Connects to a fake_pvconn with vconn_open(), then closes the listener and
* verifies that vconn_connect() reports 'expected_error'. */
static void
-test_refuse_connection(int argc UNUSED, char *argv[])
+test_refuse_connection(int argc
OVS_
UNUSED, char *argv[])
{
const char *type = argv[1];
int expected_error;
struct fake_pvconn fpv;
struct vconn *vconn;
{
const char *type = argv[1];
int expected_error;
struct fake_pvconn fpv;
struct vconn *vconn;
- expected_error = !strcmp(type, "unix") ? EPIPE : ECONNRESET;
+ expected_error = (!strcmp(type, "unix") ? EPIPE
+ : !strcmp(type, "tcp") ? ECONNRESET
+ : EPROTO);
fpv_create(type, &fpv);
CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0);
fpv_create(type, &fpv);
CHECK_ERRNO(vconn_open(fpv.vconn_name, OFP_VERSION, &vconn), 0);
@@
-156,7
+158,7
@@
test_refuse_connection(int argc UNUSED, char *argv[])
* closes it immediately, and verifies that vconn_connect() reports
* 'expected_error'. */
static void
* closes it immediately, and verifies that vconn_connect() reports
* 'expected_error'. */
static void
-test_accept_then_close(int argc UNUSED, char *argv[])
+test_accept_then_close(int argc
OVS_
UNUSED, char *argv[])
{
const char *type = argv[1];
int expected_error;
{
const char *type = argv[1];
int expected_error;
@@
-181,7
+183,7
@@
test_accept_then_close(int argc UNUSED, char *argv[])
* reads the hello message from it, then closes the connection and verifies
* that vconn_connect() reports 'expected_error'. */
static void
* reads the hello message from it, then closes the connection and verifies
* that vconn_connect() reports 'expected_error'. */
static void
-test_read_hello(int argc UNUSED, char *argv[])
+test_read_hello(int argc
OVS_
UNUSED, char *argv[])
{
const char *type = argv[1];
struct fake_pvconn fpv;
{
const char *type = argv[1];
struct fake_pvconn fpv;
@@
-310,7
+312,7
@@
test_send_hello(const char *type, const void *out, size_t out_size,
/* Try connecting and sending a normal hello, which should succeed. */
static void
/* Try connecting and sending a normal hello, which should succeed. */
static void
-test_send_plain_hello(int argc UNUSED, char *argv[])
+test_send_plain_hello(int argc
OVS_
UNUSED, char *argv[])
{
const char *type = argv[1];
struct ofp_header hello;
{
const char *type = argv[1];
struct ofp_header hello;
@@
-326,7
+328,7
@@
test_send_plain_hello(int argc UNUSED, char *argv[])
* the specification says that implementations must accept and ignore extra
* data). */
static void
* the specification says that implementations must accept and ignore extra
* data). */
static void
-test_send_long_hello(int argc UNUSED, char *argv[])
+test_send_long_hello(int argc
OVS_
UNUSED, char *argv[])
{
const char *type = argv[1];
struct ofp_header hello;
{
const char *type = argv[1];
struct ofp_header hello;
@@
-344,7
+346,7
@@
test_send_long_hello(int argc UNUSED, char *argv[])
/* Try connecting and sending an echo request instead of a hello, which should
* fail with EPROTO. */
static void
/* Try connecting and sending an echo request instead of a hello, which should
* fail with EPROTO. */
static void
-test_send_echo_hello(int argc UNUSED, char *argv[])
+test_send_echo_hello(int argc
OVS_
UNUSED, char *argv[])
{
const char *type = argv[1];
struct ofp_header echo;
{
const char *type = argv[1];
struct ofp_header echo;
@@
-359,7
+361,7
@@
test_send_echo_hello(int argc UNUSED, char *argv[])
/* Try connecting and sending a hello packet that has its length field as 0,
* which should fail with EPROTO. */
static void
/* Try connecting and sending a hello packet that has its length field as 0,
* which should fail with EPROTO. */
static void
-test_send_short_hello(int argc UNUSED, char *argv[])
+test_send_short_hello(int argc
OVS_
UNUSED, char *argv[])
{
const char *type = argv[1];
struct ofp_header hello;
{
const char *type = argv[1];
struct ofp_header hello;
@@
-371,7
+373,7
@@
test_send_short_hello(int argc UNUSED, char *argv[])
/* Try connecting and sending a hello packet that has a bad version, which
* should fail with EPROTO. */
static void
/* Try connecting and sending a hello packet that has a bad version, which
* should fail with EPROTO. */
static void
-test_send_invalid_version_hello(int argc UNUSED, char *argv[])
+test_send_invalid_version_hello(int argc
OVS_
UNUSED, char *argv[])
{
const char *type = argv[1];
struct ofp_header hello;
{
const char *type = argv[1];
struct ofp_header hello;
@@
-399,10
+401,8
@@
int
main(int argc, char *argv[])
{
set_program_name(argv[0]);
main(int argc, char *argv[])
{
set_program_name(argv[0]);
- time_init();
- vlog_init();
- vlog_set_levels(VLM_ANY_MODULE, VLF_ANY_FACILITY, VLL_EMER);
- vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_DBG);
+ vlog_set_levels(NULL, VLF_ANY_FACILITY, VLL_EMER);
+ vlog_set_levels(NULL, VLF_CONSOLE, VLL_DBG);
signal(SIGPIPE, SIG_IGN);
time_alarm(10);
signal(SIGPIPE, SIG_IGN);
time_alarm(10);