X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftest-vconn.c;h=12b69ca0bff41ce5a75e7e97a444e6f0bf2590d3;hb=a23aab1fc2f66b63ba9b7e4b9c9a8f6d58c367d0;hp=265bdecb5e7e6acd2116ba390ab3969a95cdeadd;hpb=a36919566a348427d28dce06b607a3dcfeb64822;p=openvswitch diff --git a/tests/test-vconn.c b/tests/test-vconn.c index 265bdecb..12b69ca0 100644 --- 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; - 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); @@ -399,10 +401,8 @@ int 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);