Rather than add to the overhead of getting this change accepted, I'm going
to roll back the DEB_BUILD_OPTS=nocheck change given it's unrelated to this
bug (per the freeze policy
https://release.debian.org/jessie/freeze_policy.html). I'll roll it back in
after the freeze.

Proposed change to 0.11.0-4 looks like this:

$ debdiff ~/Source/hiredis_0.11.0-4.dsc ../hiredis_0.11.0-5.dsc
gpgv: Signature made Sun 30 Nov 2014 01:12:44 PM PST using RSA key ID
6C6608D1
gpgv: Can't check signature: public key not found
dpkg-source: warning: failed to verify signature on
/home/tom/Source/debian/hiredis_0.11.0-5.dsc
diff -Nru hiredis-0.11.0/debian/changelog hiredis-0.11.0/debian/changelog
--- hiredis-0.11.0/debian/changelog     2014-10-03 20:30:13.000000000 -0700
+++ hiredis-0.11.0/debian/changelog     2014-11-30 13:09:15.000000000 -0800
@@ -1,3 +1,9 @@
+hiredis (0.11.0-5) unstable; urgency=medium
+
+  * Disable a network test failing in pbuilder (closes: #770648)
+
+ -- Tom Lee <deb...@tomlee.co>  Mon, 24 Nov 2014 00:17:31 -0800
+
 hiredis (0.11.0-4) unstable; urgency=medium

   * Symlinks for cmake 3.0 (closes: #758548)
diff -Nru hiredis-0.11.0/debian/patches/04_disable-network-tests.patch
hiredis-0.11.0/debian/patches/04_disable-network-tests.patch
--- hiredis-0.11.0/debian/patches/04_disable-network-tests.patch
 1969-12-31 16:00:00.000000000 -0800
+++ hiredis-0.11.0/debian/patches/04_disable-network-tests.patch
 2014-11-29 22:36:40.000000000 -0800
@@ -0,0 +1,25 @@
+Description: Disable "Returns error when host cannot be resolved"
+ This patch disables a test that relies on the presence of a
+ network connection.
+Author: Tobias Frost <t...@debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test.c
++++ b/test.c
+@@ -282,12 +282,16 @@
+ static void test_blocking_connection_errors(void) {
+     redisContext *c;
+
++#if 0
+     test("Returns error when host cannot be resolved: ");
+     c = redisConnect((char*)"idontexist.local", 6379);
+     test_cond(c->err == REDIS_ERR_OTHER &&
+         (strcmp(c->errstr,"Name or service not known") == 0 ||
+          strcmp(c->errstr,"Can't resolve: idontexist.local") == 0));
+     redisFree(c);
++#else
++    test("SKIPPED: Returns error when host cannot be resolved\n");
++#endif
+
+     /*test("Returns error when the port is not open: ");
+     c = redisConnect((char*)"localhost", 1);
diff -Nru hiredis-0.11.0/debian/patches/series
hiredis-0.11.0/debian/patches/series
--- hiredis-0.11.0/debian/patches/series        2014-10-03
20:30:13.000000000 -0700
+++ hiredis-0.11.0/debian/patches/series        2014-11-24
00:11:32.000000000 -0800
@@ -1,3 +1,4 @@
 01_use-proper-destdir.patch
 02_disable-failing-test.patch
 03_pkgconfig-cmake.patch
+04_disable-network-tests.patch


On Sun, Nov 30, 2014 at 12:59 PM, Tom Lee <deb...@tomlee.co> wrote:

> D'oh :) There I go making assumptions.
>
> All the same, I feel like we can argue back and forth about the severity
> of this issue but we've got a potential fix ready to go. Might as well get
> the release team involved -- if we can arrange an unblock the whole issue
> is moot.
>
> On Sun, Nov 30, 2014 at 11:00 AM, gregor herrmann <gre...@debian.org>
> wrote:
>
>> On Sun, 30 Nov 2014 10:51:56 -0800, Tom Lee wrote:
>>
>> > Talked this over with the release team on #debian-release,
>>
>> Except that noone who responded is a member of the release team :)
>>
>> Cheers,
>> gregor
>>
>> --
>>  .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key
>> 0xBB3A68018649AA06
>>  : :' : Debian GNU/Linux user, admin, and developer  -
>> http://www.debian.org/
>>  `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation
>> Europe
>>    `-   NP: Cat Stevens: I Love My Dog
>>
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v1
>>
>> iQJ8BAEBCgBmBQJUe2l0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
>> ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMUUxMzE2RTkzQTc2MEE4MTA0RDg1RkFC
>> QjNBNjgwMTg2NDlBQTA2AAoJELs6aAGGSaoGscoQAJIK0qNAR4/HTYvVRo7barIC
>> ZK9EombbjP8kK+iNoX2lAhDhawJgwEJ7fUOWtcjG4rjamYsSGI9HKB9abu7Brqhb
>> nap+NS5NKFctfdQP2zSn9AXpu8TWwzdC73a5BOAs3Msr6T2BHcKX+e8xcdXj77xc
>> FFtvcPUcFLzBtCxZA+wBrWWvPn+ZJAVIKhcoxf/85JFpfmbGyjHdwiwq9XoTgfHu
>> f5esudD3UjSzYYDpMf1fgWbdfG3E1CDmbfNsuBMAmnp4TUUGlL5MiaFjIMggBk/f
>> M8K9TuLah/I8/kTLNfoWjQ74+q6WJI3GySXPpHdmHny+wltY92gs0d7mea3pzov/
>> UiIMGUpO5kwX6CwL3mN9wFkhSbjEy6kBrUTBnDgXsH2ktGjn6bbjnDl8Tn++Idnz
>> iLfDVStzlDtihg12zxT2gthoiFx7YcYFOlQSo6wxwDoOFUM0zJmuv1rov919UaQ4
>> 5GJhHD4CWG1oFEn/s/7z+aOrjb39X2cF1OQa8FzqYTnmBTd+vwSLNNP4S2ipOKJU
>> hTWb6cov7xpZwdxZJfOCzWX3PJEuxDHZZjLHWQy0QNdkeEJouEe6edMdb//tYQEk
>> vDCplr7xZfcVbJ2ALz0uiKWyOaP48AB0r8MED7T1e8qwxEBp1LqS1AQA87NNsNgA
>> G0q+Hrl4KbKUVI8I2RDO
>> =6Enz
>> -----END PGP SIGNATURE-----
>>
>>
>
>
> --
> *Tom Lee */ http://tomlee.co / @tglee <http://twitter.com/tglee>
>
>


-- 
*Tom Lee */ http://tomlee.co / @tglee <http://twitter.com/tglee>

Reply via email to