diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-06-26 17:39:17 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-06-27 17:28:05 -0700 |
| commit | 251553b13e6bc8019914b9edd1292f97e856dd43 (patch) | |
| tree | 9193b8b4d4df86253f0a469cd96d8bb304a64c82 /tests | |
| parent | 91f9061ad9289afffb0111c03a8390d0f82d7114 (diff) | |
| download | nng-251553b13e6bc8019914b9edd1292f97e856dd43.tar.gz nng-251553b13e6bc8019914b9edd1292f97e856dd43.tar.bz2 nng-251553b13e6bc8019914b9edd1292f97e856dd43.zip | |
fixes #522 Separate out the endpoint plumbing
This separates the plumbing for endpoints into distinct
dialer and listeners. Some of the transports could benefit
from further separation, but we've done some rather larger
separation e.g. for the websocket transport.
IPC would be a good one to update later, when we start looking
at exposing a more natural underlying API.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sock.c | 10 | ||||
| -rw-r--r-- | tests/transport.c | 54 |
2 files changed, 28 insertions, 36 deletions
diff --git a/tests/sock.c b/tests/sock.c index 29043cb3..3792090b 100644 --- a/tests/sock.c +++ b/tests/sock.c @@ -403,11 +403,6 @@ TestMain("Socket Operations", { So(nng_dialer_setopt(ep, NNG_OPT_RECVMAXSZ, "a", 1) == NNG_EINVAL); }); - Convey("Cannot listen", { - nng_listener l; - l.id = ep.id; - So(nng_listener_start(l, 0) == NNG_ENOTSUP); - }); }); Convey("Listener creation ok", { @@ -452,11 +447,6 @@ TestMain("Socket Operations", { So(nng_listener_setopt(ep, NNG_OPT_RECVMAXSZ, "a", 1) == NNG_EINVAL); }); - Convey("Cannot dial", { - nng_dialer d; - d.id = ep.id; - So(nng_dialer_start(d, 0) == NNG_ENOTSUP); - }); }); Convey("Cannot access absent ep options", { diff --git a/tests/transport.c b/tests/transport.c index 9992408b..c060a26f 100644 --- a/tests/transport.c +++ b/tests/transport.c @@ -40,45 +40,48 @@ finish(void) // Fake TCP transport struct nni_tran fake_tcp = { - .tran_version = NNI_TRANSPORT_VERSION, - .tran_scheme = "tcp", - .tran_ep = NULL, - .tran_pipe = NULL, - .tran_init = goodinit, - .tran_fini = finish, + .tran_version = NNI_TRANSPORT_VERSION, + .tran_scheme = "tcp", + .tran_dialer = NULL, + .tran_listener = NULL, + .tran_pipe = NULL, + .tran_init = goodinit, + .tran_fini = finish, }; // Bad version transport struct nni_tran badvers = { - .tran_version = NNI_TRANSPORT_VERSION + 1, - .tran_scheme = "badvers", - .tran_ep = NULL, - .tran_pipe = NULL, - .tran_init = goodinit, - .tran_fini = finish, + .tran_version = NNI_TRANSPORT_VERSION + 1, + .tran_scheme = "badvers", + .tran_dialer = NULL, + .tran_listener = NULL, + .tran_pipe = NULL, + .tran_init = goodinit, + .tran_fini = finish, }; struct nni_tran badtran = { - .tran_version = NNI_TRANSPORT_VERSION, - .tran_scheme = "badtran", - .tran_ep = NULL, - .tran_pipe = NULL, - .tran_init = badinit, - .tran_fini = finish, + .tran_version = NNI_TRANSPORT_VERSION, + .tran_scheme = "badtran", + .tran_dialer = NULL, + .tran_listener = NULL, + .tran_pipe = NULL, + .tran_init = badinit, + .tran_fini = finish, }; // Bogus good transport struct nni_tran goodtran = { - .tran_version = NNI_TRANSPORT_VERSION, - .tran_scheme = "goodtran", - .tran_ep = NULL, - .tran_pipe = NULL, - .tran_init = goodinit, - .tran_fini = finish, + .tran_version = NNI_TRANSPORT_VERSION, + .tran_scheme = "goodtran", + .tran_dialer = NULL, + .tran_listener = NULL, + .tran_pipe = NULL, + .tran_init = goodinit, + .tran_fini = finish, }; TestMain("Pluggable Transports", { - Convey("Registering TCP again fails", { So(nni_tran_register(&fake_tcp) == NNG_ESTATE); So(ninits == 0); @@ -121,5 +124,4 @@ TestMain("Pluggable Transports", { So(nfinis == 1); }); }); - }) |