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

Partially revert "Problem: monitor events are output as decimal in assertion messages"

Browse Source 
This partially reverts commit 19c6aa5c92.
This commit is contained in:
Simon Giesecke 2019-02-07 09:46:30 -05:00
parent a3a40a01c9
commit 4273ffd266
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_monitor.cpp
View File

@ -171,7 +171,7 @@ void test_monitor_versioned_basic (bind_function_t bind_function_,
event = get_monitor_event_v2 (client_mon, NULL, &client_local_address, event = get_monitor_event_v2 (client_mon, NULL, &client_local_address,
&client_remote_address); &client_remote_address);
} }
TEST_ASSERT_EQUAL_HEX64 (ZMQ_EVENT_CONNECTED, event); TEST_ASSERT_EQUAL (ZMQ_EVENT_CONNECTED, event);
TEST_ASSERT_EQUAL_STRING (server_endpoint, client_remote_address); TEST_ASSERT_EQUAL_STRING (server_endpoint, client_remote_address);
TEST_ASSERT_EQUAL_STRING_LEN (expected_prefix_, client_local_address, TEST_ASSERT_EQUAL_STRING_LEN (expected_prefix_, client_local_address,
strlen (expected_prefix_)); strlen (expected_prefix_));
@ -192,11 +192,11 @@ void test_monitor_versioned_basic (bind_function_t bind_function_,
event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL); event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL);
// Sometimes the server sees the client closing before it gets closed. // Sometimes the server sees the client closing before it gets closed.
if (event != ZMQ_EVENT_DISCONNECTED) { if (event != ZMQ_EVENT_DISCONNECTED) {
TEST_ASSERT_EQUAL_HEX64 (ZMQ_EVENT_CLOSED, event); TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_CLOSED, event);
event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL); event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL);
} }
if (event != ZMQ_EVENT_DISCONNECTED) { if (event != ZMQ_EVENT_DISCONNECTED) {
TEST_ASSERT_EQUAL_HEX64 (ZMQ_EVENT_MONITOR_STOPPED, event); TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_MONITOR_STOPPED, event);
} }
free (client_local_address); free (client_local_address);
free (client_remote_address); free (client_remote_address);