projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Generalize facet_put__() so that it is more useful.
[openvswitch]
/
tests
/
test-vconn.c
diff --git
a/tests/test-vconn.c
b/tests/test-vconn.c
index a394f6cfbc20562b2148e11baa8ba1aafd80609d..12b69ca0bff41ce5a75e7e97a444e6f0bf2590d3 100644
(file)
--- a/
tests/test-vconn.c
+++ b/
tests/test-vconn.c
@@
-141,7
+141,9
@@
test_refuse_connection(int argc OVS_UNUSED, char *argv[])
struct fake_pvconn fpv;
struct vconn *vconn;
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);
@@
-396,13
+398,11
@@
static const struct command commands[] = {
};
int
};
int
-main(int argc
OVS_UNUSED
, char *argv[])
+main(int argc, char *argv[])
{
set_program_name(argv[0]);
{
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);