generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 18:40:27 +01:00
Code Issues Projects Releases Wiki Activity

Cleaned up XFAIL on resources

Browse Source 
- this failing test was confusing users
- ZMTP v3.0 now does not define resources at all
- resources, along with other unimplemented aspects moved to
  RFC 37 ZMTP v3.1
This commit is contained in:
Pieter Hintjens 2014-04-05 15:32:43 +02:00
parent 84bf625477
commit 8fcda0d5da
2 changed files with 3 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Makefile.am
View File

@ -1,5 +1,5 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_srcdir)/include
AM_CPPFLAGS = -I$(top_builddir)/include \
-I$(top_srcdir)/include
LDADD = $(top_builddir)/src/libzmq.la
@ -19,7 +19,6 @@ noinst_PROGRAMS = test_system \
test_term_endpoint \
test_srcfd \
test_monitor \
test_resource \
test_router_mandatory \
test_router_handover \
test_probe_router \
@ -86,7 +85,6 @@ test_last_endpoint_SOURCES = test_last_endpoint.cpp
test_term_endpoint_SOURCES = test_term_endpoint.cpp
test_srcfd_SOURCES = test_srcfd.cpp
test_monitor_SOURCES = test_monitor.cpp
test_resource_SOURCES = test_resource.cpp
test_router_mandatory_SOURCES = test_router_mandatory.cpp
test_router_handover_SOURCES = test_router_handover.cpp
test_probe_router_SOURCES = test_probe_router.cpp
@ -137,7 +135,7 @@ endif
# Run the test cases
TESTS = $(noinst_PROGRAMS)
XFAIL_TESTS = test_resource
XFAIL_TESTS =
if !ON_LINUX
XFAIL_TESTS += test_abstract_ipc

56
tests/test_resource.cpp
View File

@ -1,56 +0,0 @@
/*
Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
This file is part of 0MQ.
0MQ is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
0MQ is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "testutil.hpp"
int main (int argc, char *argv [])
{
const char *bind_1 = "tcp://127.0.0.1:5555/resource/1";
const char *bind_2 = "tcp://127.0.0.1:5555/resource/2";
int rc;
void* ctx = zmq_init (1);
assert (ctx);
void* p1 = zmq_socket (ctx, ZMQ_PUSH);
assert (p1);
rc = zmq_bind(p1, bind_1);
assert (rc == 0);
void* p2 = zmq_socket (ctx, ZMQ_PUSH);
assert (p2);
// should be able to bind a second socket to the same ip/port
// but with different resource
rc = zmq_bind(p2, bind_2);
assert (rc == 0);
rc = zmq_close (p1);
assert (rc == 0);
rc = zmq_close (p2);
assert (rc == 0);
rc = zmq_term (ctx);
assert (rc == 0);
return 0;
}