From 92c01f69db71ce693f3e3ae121b22217815266e6 Mon Sep 17 00:00:00 2001
From: Pieter Hintjens <ph@imatix.com>
Date: Fri, 20 Sep 2013 14:23:43 +0200
Subject: [PATCH] Renamed test_connect_delay to test_immediate

* The ZMQ_CONNECT_DELAY option was renamed to ZMQ_IMMEDIATE
---
 .gitignore                                           | 2 +-
 CMakeLists.txt                                       | 2 +-
 tests/Makefile.am                                    | 4 ++--
 tests/{test_connect_delay.cpp => test_immediate.cpp} | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename tests/{test_connect_delay.cpp => test_immediate.cpp} (96%)

diff --git a/.gitignore b/.gitignore
index e0ef6157..89195f25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,7 @@ tests/test_invalid_rep
 tests/test_msg_flags
 tests/test_ts_context
 tests/test_connect_resolve
-tests/test_connect_delay
+tests/test_immediate
 tests/test_term_endpoint
 tests/test_router_mandatory
 tests/test_disconnect_inproc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9d16a12..197872fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -579,7 +579,7 @@ endif()
 enable_testing()
 set(tests 
         test_system
-        test_connect_delay
+        test_immediate
         test_connect_resolve
         test_ctx_destroy
         test_ctx_options
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d97f869b..c894d6d5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,7 +14,7 @@ noinst_PROGRAMS = test_system \
                   test_invalid_rep \
                   test_msg_flags \
                   test_connect_resolve \
-                  test_connect_delay \
+                  test_immediate \
                   test_last_endpoint \
                   test_term_endpoint \
                   test_linger \
@@ -59,7 +59,7 @@ test_invalid_rep_SOURCES = test_invalid_rep.cpp
 test_linger_SOURCES = test_linger.cpp
 test_msg_flags_SOURCES = test_msg_flags.cpp
 test_connect_resolve_SOURCES = test_connect_resolve.cpp
-test_connect_delay_SOURCES = test_connect_delay.cpp
+test_immediate_SOURCES = test_immediate.cpp
 test_last_endpoint_SOURCES = test_last_endpoint.cpp
 test_term_endpoint_SOURCES = test_term_endpoint.cpp
 test_monitor_SOURCES = test_monitor.cpp
diff --git a/tests/test_connect_delay.cpp b/tests/test_immediate.cpp
similarity index 96%
rename from tests/test_connect_delay.cpp
rename to tests/test_immediate.cpp
index 6dfc817f..f385774b 100644
--- a/tests/test_connect_delay.cpp
+++ b/tests/test_immediate.cpp
@@ -117,7 +117,7 @@ int main (void)
 
     // Set the key flag
     val = 1;
-    rc = zmq_setsockopt (from, ZMQ_DELAY_ATTACH_ON_CONNECT, &val, sizeof(val));
+    rc = zmq_setsockopt (from, ZMQ_IMMEDIATE, &val, sizeof(val));
     assert (rc == 0);
 
     // Connect to the invalid socket
@@ -170,9 +170,9 @@ int main (void)
     rc = zmq_setsockopt (frontend, ZMQ_LINGER, &zero, sizeof (zero));
     assert (rc == 0);
 
-    //  Frontend connects to backend using DELAY_ATTACH_ON_CONNECT
+    //  Frontend connects to backend using IMMEDIATE
     int on = 1;
-    rc = zmq_setsockopt (frontend, ZMQ_DELAY_ATTACH_ON_CONNECT, &on, sizeof (on));
+    rc = zmq_setsockopt (frontend, ZMQ_IMMEDIATE, &on, sizeof (on));
     assert (rc == 0);
     rc = zmq_bind (backend, "tcp://127.0.0.1:5560");
     assert (rc == 0);