Drizzle

Merge lp:~brianaker/drizzle/libdrizzle-disconnect into lp:drizzle/7.1

  1. libdrizzle-disconnect
  2. Merge into 7.1
Proposed by Brian Aker
Status: Merged
Approved by: Brian Aker
Approved revision: 2543
Merged at revision: 2544
Proposed branch: lp:~brianaker/drizzle/libdrizzle-disconnect
Merge into: lp:drizzle/7.1
Diff against target: 202 lines (+47/-20)
2 files modified
libdrizzle-1.0/t/drizzle_con_st.c (+33/-7)
libdrizzle/conn.cc (+14/-13)
To merge this branch: bzr merge lp:~brianaker/drizzle/libdrizzle-disconnect
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+102934@code.launchpad.net

Description of the change

Fixes error in unit tests.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdrizzle-1.0/t/drizzle_con_st.c'
2--- libdrizzle-1.0/t/drizzle_con_st.c 2011-12-14 20:53:40 +0000
3+++ libdrizzle-1.0/t/drizzle_con_st.c 2012-04-20 20:31:20 +0000
4@@ -50,12 +50,6 @@
5 {
6 close(STDOUT_FILENO);
7
8- drizzle_st *drizzle;
9- drizzle_con_st *con;
10- drizzle_con_st con_buffer;
11- drizzle_con_st *clone;
12- drizzle_return_t ret;
13-
14 printf("sizeof(drizzle_con_st) = %zu\n", sizeof(drizzle_con_st));
15 printf("sizeof(drizzle_con_tcp_st) = %zu\n", sizeof(drizzle_con_tcp_st));
16 printf("sizeof(drizzle_con_uds_st) = %zu\n", sizeof(drizzle_con_uds_st));
17@@ -66,64 +60,94 @@
18 printf("sizeof(drizzle_capabilities_t) = %zu\n",
19 sizeof(drizzle_capabilities_t));
20
21+ drizzle_st *drizzle;
22 drizzle_test("drizzle_create");
23 if ((drizzle= drizzle_create(NULL)) == NULL)
24+ {
25 drizzle_test_error("returned NULL");
26+ }
27
28+ drizzle_con_st con_buffer;
29+ drizzle_con_st *con;
30 drizzle_test("drizzle_con_create buffer");
31 if ((con= drizzle_con_create(drizzle, &con_buffer)) == NULL)
32+ {
33 drizzle_test_error("returned NULL");
34+ }
35 drizzle_con_free(con);
36
37 drizzle_test("drizzle_con_create");
38 if ((con= drizzle_con_create(drizzle, NULL)) == NULL)
39+ {
40 drizzle_test_error("returned NULL");
41+ }
42
43+ drizzle_con_st *clone;
44 drizzle_test("drizzle_con_clone");
45 if ((clone= drizzle_con_clone(drizzle, NULL, con)) == NULL)
46+ {
47 drizzle_test_error("returned NULL");
48+ }
49 drizzle_con_free(clone);
50
51 drizzle_test("drizzle_con_options");
52 if (drizzle_con_options(con) != (DRIZZLE_CON_ALLOCATED | DRIZZLE_CON_MYSQL))
53+ {
54 drizzle_test_error("drizzle_con_options");
55+ }
56
57 drizzle_test("drizzle_con_add_options");
58 drizzle_con_add_options(con, DRIZZLE_CON_EXPERIMENTAL);
59 if (drizzle_con_options(con) != (DRIZZLE_CON_ALLOCATED | DRIZZLE_CON_EXPERIMENTAL))
60+ {
61 drizzle_test_error("drizzle_con_options");
62+ }
63
64 drizzle_test("drizzle_con_set_tcp");
65 drizzle_con_set_tcp(con, "localhost", 1);
66
67 drizzle_test("drizzle_con_host");
68 if (strcmp(drizzle_con_host(con), "localhost"))
69+ {
70 drizzle_test_error("expected host not set");
71+ }
72
73 drizzle_test("drizzle_con_port");
74 if (drizzle_con_port(con) != 1)
75+ {
76 drizzle_test_error("expected port not set");
77+ }
78
79 drizzle_test("drizzle_con_fd");
80 if (drizzle_con_fd(con) != -1)
81+ {
82 drizzle_test_error("drizzle_con_fd != -1 for a new connection");
83+ }
84
85 drizzle_test("drizzle_con_connect");
86- ret= drizzle_con_connect(con);
87+ drizzle_return_t ret= drizzle_con_connect(con);
88 if (ret != DRIZZLE_RETURN_COULD_NOT_CONNECT)
89+ {
90 drizzle_test_error("expected COULD_NOT_CONNECT, got: %s\n", drizzle_error(drizzle));
91+ }
92
93 if (drizzle_con_fd(con) != -1)
94+ {
95 drizzle_test_error("drizzle_con_fd != -1 for unconnected connection");
96+ }
97
98 drizzle_test("drizzle_con_listen");
99 drizzle_con_set_tcp(con, "localhost", DRIZZLE_TEST_PORT);
100 ret = drizzle_con_listen(con);
101 if (ret != DRIZZLE_RETURN_OK)
102+ {
103 drizzle_test_error("drizzle_con_listen: %s", drizzle_error(drizzle));
104+ }
105
106 if (drizzle_con_fd(con) <= 0)
107+ {
108 drizzle_test_error("drizzle_con_fd <= 0 for a listening connection");
109+ }
110
111 drizzle_test("drizzle_con_free");
112 drizzle_con_free(con);
113@@ -134,7 +158,9 @@
114 drizzle_con_set_uds(con, "/dev/null");
115 clone= drizzle_con_clone(drizzle, NULL, con);
116 if (clone == NULL)
117+ {
118 drizzle_test_error("drizzle_con_clone uds: %s", drizzle_error(drizzle));
119+ }
120 drizzle_con_free(clone);
121 drizzle_con_free(con);
122
123
124=== modified file 'libdrizzle/conn.cc'
125--- libdrizzle/conn.cc 2012-04-17 06:03:03 +0000
126+++ libdrizzle/conn.cc 2012-04-20 20:31:20 +0000
127@@ -1391,12 +1391,8 @@
128 drizzle_state_pop(con);
129 return DRIZZLE_RETURN_OK;
130 }
131- drizzle_state_pop(con);
132- drizzle_state_push(con, drizzle_state_connecting);
133- return DRIZZLE_RETURN_OK;
134 }
135-
136- if (errno == ECONNREFUSED || errno == ENETUNREACH || errno == ETIMEDOUT)
137+ else if (errno == ECONNREFUSED || errno == ENETUNREACH || errno == ETIMEDOUT)
138 {
139 con->addrinfo_next= con->addrinfo_next->ai_next;
140 return DRIZZLE_RETURN_OK;
141@@ -1557,8 +1553,8 @@
142
143 if (read_size == 0)
144 {
145- drizzle_set_error(con->drizzle, "drizzle_state_read",
146- "lost connection to server (EOF)");
147+ drizzle_set_error(con->drizzle, __func__,
148+ "%s:%d lost connection to server (EOF)", __FILE__, __LINE__);
149 return DRIZZLE_RETURN_LOST_CONNECTION;
150 }
151 else if (read_size == -1)
152@@ -1595,7 +1591,8 @@
153 else if (errno == EPIPE || errno == ECONNRESET)
154 {
155 drizzle_set_error(con->drizzle, __func__,
156- "lost connection to server (%s)", strerror(errno));
157+ "%s:%d lost connection to server (%s)",
158+ __FILE__, __LINE__, strerror(errno));
159 return DRIZZLE_RETURN_LOST_CONNECTION;
160 }
161
162@@ -1676,24 +1673,27 @@
163 write_size, strerror(errno));
164
165 if (write_size == 0)
166- {
167- drizzle_set_error(con->drizzle, __func__, "lost connection to server (EOF)");
168- return DRIZZLE_RETURN_LOST_CONNECTION;
169- }
170+ { }
171 else if (write_size == -1)
172 {
173 if (errno == EAGAIN)
174 {
175 ret= drizzle_con_set_events(con, POLLOUT);
176 if (ret != DRIZZLE_RETURN_OK)
177+ {
178 return ret;
179+ }
180
181 if (con->drizzle->options & DRIZZLE_NON_BLOCKING)
182+ {
183 return DRIZZLE_RETURN_IO_WAIT;
184+ }
185
186 ret= drizzle_con_wait(con->drizzle);
187 if (ret != DRIZZLE_RETURN_OK)
188+ {
189 return ret;
190+ }
191
192 continue;
193 }
194@@ -1703,7 +1703,8 @@
195 }
196 else if (errno == EPIPE || errno == ECONNRESET)
197 {
198- drizzle_set_error(con->drizzle, __func__, "lost connection to server (%s)", strerror(errno));
199+ drizzle_set_error(con->drizzle, __func__, "%s:%d lost connection to server (%s)",
200+ __FILE__, __LINE__, strerror(errno));
201 return DRIZZLE_RETURN_LOST_CONNECTION;
202 }
203

Subscribers

People subscribed via source and target branches

to all changes: