Merge lp:~piotr-sikora/libmemcached/fix-tests-on-openbsd into lp:~tangent-org/libmemcached/trunk

Proposed by Piotr Sikora
Status: Work in progress
Proposed branch: lp:~piotr-sikora/libmemcached/fix-tests-on-openbsd
Merge into: lp:~tangent-org/libmemcached/trunk
Diff against target: 10 lines (+1/-0)
1 file modified
libtest/server.c (+1/-0)
To merge this branch: bzr merge lp:~piotr-sikora/libmemcached/fix-tests-on-openbsd
Reviewer Review Type Date Requested Status
Libmemcached-developers Pending
Review via email: mp+67954@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Aker (brianaker) wrote :

Thanks, in the most recent copy I've modified the logic such that this no longer is being checked in quite the same way.

Unmerged revisions

948. By Piotr Sikora

server_startup: whitelist ECONNREFUSED in fopen's errno switch.

It seems that because errno doesn't get cleared, the problematic switch
relies on errno value propagated not only from the failed fopen(), but
also from libmemcached_util_ping() call ~100 lines before.

Running tests on OpenBSD resulted in such error:

  Could not open pid file /tmp/memcached.pidXXXXXX -> fopen(Connection refused)

which obviously doesn't make any sense.

This change fixes that and allows tests to run.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libtest/server.c'
2--- libtest/server.c 2011-06-24 20:09:30 +0000
3+++ libtest/server.c 2011-07-14 12:21:44 +0000
4@@ -281,6 +281,7 @@
5 break;
6
7 case ENOTCONN:
8+ case ECONNREFUSED:
9 continue;
10 }
11

Subscribers

People subscribed via source and target branches

to all changes: