diff -Nru etcd-3.1.8+dfsg/debian/changelog etcd-3.1.8+dfsg/debian/changelog --- etcd-3.1.8+dfsg/debian/changelog 2017-06-04 18:03:52.000000000 -0500 +++ etcd-3.1.8+dfsg/debian/changelog 2017-06-29 05:02:03.000000000 -0500 @@ -1,3 +1,10 @@ +etcd (3.1.8+dfsg-3) unstable; urgency=medium + + * Non-maintainer upload. + * Fixes integration test from upstream patch + + -- Harish Sriram Thu, 29 Jun 2017 05:02:03 -0500 + etcd (3.1.8+dfsg-2) unstable; urgency=medium * Fix upgrade problem caused by client/server package split. Thanks diff -Nru etcd-3.1.8+dfsg/debian/patches/fix-integration-tests.patch etcd-3.1.8+dfsg/debian/patches/fix-integration-tests.patch --- etcd-3.1.8+dfsg/debian/patches/fix-integration-tests.patch 1969-12-31 18:00:00.000000000 -0600 +++ etcd-3.1.8+dfsg/debian/patches/fix-integration-tests.patch 2017-06-29 04:59:42.000000000 -0500 @@ -0,0 +1,20 @@ +--- a/client/integration/client_test.go ++++ b/client/integration/client_test.go +@@ -34,7 +34,7 @@ import ( + func TestV2NoRetryEOF(t *testing.T) { + defer testutil.AfterTest(t) + // generate an EOF response; specify address so appears first in sorted ep list +- lEOF := integration.NewListenerWithAddr(t, fmt.Sprintf("eof:123.%d.sock", os.Getpid())) ++ lEOF := integration.NewListenerWithAddr(t, fmt.Sprintf("127.0.0.1:%05d", os.Getpid())) + defer lEOF.Close() + tries := uint32(0) + go func() { +@@ -66,7 +66,7 @@ func TestV2NoRetryEOF(t *testing.T) { + func TestV2NoRetryNoLeader(t *testing.T) { + defer testutil.AfterTest(t) + +- lHttp := integration.NewListenerWithAddr(t, fmt.Sprintf("errHttp:123.%d.sock", os.Getpid())) ++ lHttp := integration.NewListenerWithAddr(t, fmt.Sprintf("127.0.0.1:%05d", os.Getpid())) + eh := &errHandler{errCode: http.StatusServiceUnavailable} + srv := httptest.NewUnstartedServer(eh) + defer lHttp.Close() diff -Nru etcd-3.1.8+dfsg/debian/patches/series etcd-3.1.8+dfsg/debian/patches/series --- etcd-3.1.8+dfsg/debian/patches/series 2017-06-04 18:03:52.000000000 -0500 +++ etcd-3.1.8+dfsg/debian/patches/series 2017-06-29 04:57:59.000000000 -0500 @@ -1,3 +1,4 @@ disable-network-tests.patch test_path.patch skip-dev-ptmx-error.patch +fix-integration-tests.patch