From 544042d794d4f6ac838d1b339b0e51b579e3fd48 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 May 2019 18:40:43 +0200 Subject: [PATCH] Rebase patches --- ...to-2.patch => 0001-Port-to-mockito-2.patch | 198 +++++++++--------- ...-generated-expired-test-certificates.patch | Bin 21328 -> 0 bytes httpcomponents-core.spec | 6 +- 3 files changed, 98 insertions(+), 106 deletions(-) rename 0002-Port-to-mockito-2.patch => 0001-Port-to-mockito-2.patch (67%) delete mode 100644 0001-Re-generated-expired-test-certificates.patch diff --git a/0002-Port-to-mockito-2.patch b/0001-Port-to-mockito-2.patch similarity index 67% rename from 0002-Port-to-mockito-2.patch rename to 0001-Port-to-mockito-2.patch index b235104..78aeb3d 100644 --- a/0002-Port-to-mockito-2.patch +++ b/0001-Port-to-mockito-2.patch @@ -1,21 +1,21 @@ -From 455ae8a16dba896970a89e47962d32e09f63c346 Mon Sep 17 00:00:00 2001 +From 85107ca9057cda2ed4d72ba1fd3c2c09be404af6 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 7 Dec 2018 19:50:08 +0000 -Subject: [PATCH 2/2] Port to mockito 2 +Subject: [PATCH] Port to mockito 2 For details, see: https://github.com/mockito/mockito/wiki/What%27s-new-in-Mockito-2#incompatible --- .../impl/nio/pool/TestBasicNIOConnPool.java | 2 +- - .../apache/http/nio/pool/TestNIOConnPool.java | 72 ++++++++++--------- + .../apache/http/nio/pool/TestNIOConnPool.java | 68 +++++++++---------- .../nio/protocol/TestHttpAsyncService.java | 8 +-- - 3 files changed, 43 insertions(+), 39 deletions(-) + 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java b/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java -index 78f9cdc..4d0c6b0 100644 +index 25e2781cf..ee277c69d 100644 --- a/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java +++ b/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java -@@ -115,7 +115,7 @@ public class TestBasicNIOConnPool { +@@ -115,7 +115,7 @@ public void testTimeoutOnLeaseRelease() throws Exception { Mockito.when(sessionRequest.getAttachment()).thenReturn(host); Mockito.when(reactor.connect( Matchers.any(SocketAddress.class), @@ -25,300 +25,296 @@ index 78f9cdc..4d0c6b0 100644 Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest); diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java b/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java -index e64a6d3..1ea6ce1 100644 +index 9672db6db..20f230acb 100644 --- a/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java +++ b/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java -@@ -176,7 +176,7 @@ public class TestNIOConnPool { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( +@@ -176,7 +176,7 @@ public void testSuccessfulConnect() throws Exception { + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( Matchers.any(SocketAddress.class), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest); - final LocalSessionPool pool = new LocalSessionPool(ioreactor, 2, 10); -@@ -209,7 +209,7 @@ public class TestNIOConnPool { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( + final LocalSessionPool pool = new LocalSessionPool(ioReactor, 2, 10); +@@ -209,7 +209,7 @@ public void testFailedConnect() throws Exception { + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( Matchers.any(SocketAddress.class), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest); - final LocalSessionPool pool = new LocalSessionPool(ioreactor, 2, 10); -@@ -246,7 +246,7 @@ public class TestNIOConnPool { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( + final LocalSessionPool pool = new LocalSessionPool(ioReactor, 2, 10); +@@ -246,7 +246,7 @@ public void testCencelledConnect() throws Exception { + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( Matchers.any(SocketAddress.class), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest); - Mockito.when(ioreactor.getStatus()).thenReturn(IOReactorStatus.ACTIVE); -@@ -285,7 +285,7 @@ public class TestNIOConnPool { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( + Mockito.when(ioReactor.getStatus()).thenReturn(IOReactorStatus.ACTIVE); +@@ -285,7 +285,7 @@ public void testTimeoutConnect() throws Exception { + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( Matchers.any(SocketAddress.class), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest); - final LocalSessionPool pool = new LocalSessionPool(ioreactor, 2, 10); -@@ -351,12 +351,12 @@ public class TestNIOConnPool { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( + final LocalSessionPool pool = new LocalSessionPool(ioReactor, 2, 10); +@@ -350,12 +350,12 @@ public void testLeaseRelease() throws Exception { + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest1); - Mockito.when(ioreactor.connect( + Mockito.when(ioReactor.connect( Matchers.eq(InetSocketAddress.createUnresolved("otherhost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest2); -@@ -425,12 +425,12 @@ public class TestNIOConnPool { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( +@@ -424,12 +424,12 @@ public void testMaxLimits() throws Exception { + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest1); - Mockito.when(ioreactor.connect( + Mockito.when(ioReactor.connect( Matchers.eq(InetSocketAddress.createUnresolved("otherhost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest2); -@@ -483,7 +483,8 @@ public class TestNIOConnPool { +@@ -482,7 +482,7 @@ public void testMaxLimits() throws Exception { Assert.assertFalse(future9.isDone()); - Mockito.verify(ioreactor, Mockito.times(3)).connect( + Mockito.verify(ioReactor, Mockito.times(3)).connect( - Matchers.any(SocketAddress.class), Matchers.any(SocketAddress.class), -+ Matchers.any(SocketAddress.class), -+ Matchers.isNull(), ++ Matchers.any(SocketAddress.class), Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); pool.release(entry4, true); -@@ -495,7 +496,8 @@ public class TestNIOConnPool { +@@ -494,7 +494,7 @@ public void testMaxLimits() throws Exception { Assert.assertTrue(future9.isDone()); - Mockito.verify(ioreactor, Mockito.times(4)).connect( + Mockito.verify(ioReactor, Mockito.times(4)).connect( - Matchers.any(SocketAddress.class), Matchers.any(SocketAddress.class), -+ Matchers.any(SocketAddress.class), -+ Matchers.isNull(), ++ Matchers.any(SocketAddress.class), Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); } -@@ -524,12 +526,12 @@ public class TestNIOConnPool { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( +@@ -523,12 +523,12 @@ public void testConnectionRedistributionOnTotalMaxLimit() throws Exception { + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest1, sessionRequest2, sessionRequest1); - Mockito.when(ioreactor.connect( + Mockito.when(ioReactor.connect( Matchers.eq(InetSocketAddress.createUnresolved("otherhost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest3, sessionRequest4, sessionRequest3); -@@ -545,12 +547,12 @@ public class TestNIOConnPool { +@@ -544,12 +544,12 @@ public void testConnectionRedistributionOnTotalMaxLimit() throws Exception { - Mockito.verify(ioreactor, Mockito.times(2)).connect( + Mockito.verify(ioReactor, Mockito.times(2)).connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); - Mockito.verify(ioreactor, Mockito.never()).connect( + Mockito.verify(ioReactor, Mockito.never()).connect( Matchers.eq(InetSocketAddress.createUnresolved("otherhost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); pool.requestCompleted(sessionRequest1); -@@ -576,12 +578,12 @@ public class TestNIOConnPool { +@@ -575,12 +575,12 @@ public void testConnectionRedistributionOnTotalMaxLimit() throws Exception { - Mockito.verify(ioreactor, Mockito.times(2)).connect( + Mockito.verify(ioReactor, Mockito.times(2)).connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); - Mockito.verify(ioreactor, Mockito.times(2)).connect( + Mockito.verify(ioReactor, Mockito.times(2)).connect( Matchers.eq(InetSocketAddress.createUnresolved("otherhost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); pool.requestCompleted(sessionRequest3); -@@ -604,12 +606,12 @@ public class TestNIOConnPool { +@@ -603,12 +603,12 @@ public void testConnectionRedistributionOnTotalMaxLimit() throws Exception { - Mockito.verify(ioreactor, Mockito.times(2)).connect( + Mockito.verify(ioReactor, Mockito.times(2)).connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); - Mockito.verify(ioreactor, Mockito.times(2)).connect( + Mockito.verify(ioReactor, Mockito.times(2)).connect( Matchers.eq(InetSocketAddress.createUnresolved("otherhost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); pool.release(entry3, true); -@@ -617,12 +619,12 @@ public class TestNIOConnPool { +@@ -616,12 +616,12 @@ public void testConnectionRedistributionOnTotalMaxLimit() throws Exception { - Mockito.verify(ioreactor, Mockito.times(3)).connect( + Mockito.verify(ioReactor, Mockito.times(3)).connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); - Mockito.verify(ioreactor, Mockito.times(2)).connect( + Mockito.verify(ioReactor, Mockito.times(2)).connect( Matchers.eq(InetSocketAddress.createUnresolved("otherhost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); pool.requestCompleted(sessionRequest1); -@@ -644,12 +646,12 @@ public class TestNIOConnPool { +@@ -643,12 +643,12 @@ public void testConnectionRedistributionOnTotalMaxLimit() throws Exception { - Mockito.verify(ioreactor, Mockito.times(3)).connect( + Mockito.verify(ioReactor, Mockito.times(3)).connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); - Mockito.verify(ioreactor, Mockito.times(2)).connect( + Mockito.verify(ioReactor, Mockito.times(2)).connect( Matchers.eq(InetSocketAddress.createUnresolved("otherhost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); totals = pool.getTotalStats(); -@@ -678,7 +680,7 @@ public class TestNIOConnPool { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( +@@ -677,7 +677,7 @@ public void testStatefulConnectionRedistributionOnPerRouteMaxLimit() throws Exce + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest1, sessionRequest2, sessionRequest3); -@@ -691,7 +693,7 @@ public class TestNIOConnPool { +@@ -690,7 +690,7 @@ public void testStatefulConnectionRedistributionOnPerRouteMaxLimit() throws Exce - Mockito.verify(ioreactor, Mockito.times(2)).connect( + Mockito.verify(ioReactor, Mockito.times(2)).connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); pool.requestCompleted(sessionRequest1); -@@ -726,7 +728,7 @@ public class TestNIOConnPool { +@@ -725,7 +725,7 @@ public void testStatefulConnectionRedistributionOnPerRouteMaxLimit() throws Exce - Mockito.verify(ioreactor, Mockito.times(2)).connect( + Mockito.verify(ioReactor, Mockito.times(2)).connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); pool.release(entry3, true); -@@ -743,7 +745,7 @@ public class TestNIOConnPool { +@@ -742,7 +742,7 @@ public void testStatefulConnectionRedistributionOnPerRouteMaxLimit() throws Exce - Mockito.verify(ioreactor, Mockito.times(3)).connect( + Mockito.verify(ioReactor, Mockito.times(3)).connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); - Mockito.verify(iosession2).close(); -@@ -766,7 +768,7 @@ public class TestNIOConnPool { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( + Mockito.verify(ioSession2).close(); +@@ -765,7 +765,7 @@ public void testCreateNewIfExpired() throws Exception { + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( Matchers.eq(InetSocketAddress.createUnresolved("somehost", 80)), - Matchers.any(SocketAddress.class), + Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest1); -@@ -775,7 +777,8 @@ public class TestNIOConnPool { +@@ -774,7 +774,7 @@ public void testCreateNewIfExpired() throws Exception { final Future future1 = pool.lease("somehost", null); - Mockito.verify(ioreactor, Mockito.times(1)).connect( + Mockito.verify(ioReactor, Mockito.times(1)).connect( - Matchers.any(SocketAddress.class), Matchers.any(SocketAddress.class), -+ Matchers.any(SocketAddress.class), -+ Matchers.isNull(), ++ Matchers.any(SocketAddress.class), Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); pool.requestCompleted(sessionRequest1); -@@ -795,7 +798,8 @@ public class TestNIOConnPool { +@@ -794,7 +794,7 @@ public void testCreateNewIfExpired() throws Exception { - Mockito.verify(iosession1).close(); - Mockito.verify(ioreactor, Mockito.times(2)).connect( + Mockito.verify(ioSession1).close(); + Mockito.verify(ioReactor, Mockito.times(2)).connect( - Matchers.any(SocketAddress.class), Matchers.any(SocketAddress.class), -+ Matchers.any(SocketAddress.class), -+ Matchers.isNull(), ++ Matchers.any(SocketAddress.class), Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class)); final PoolStats totals = pool.getTotalStats(); -@@ -824,7 +828,7 @@ public class TestNIOConnPool { +@@ -823,7 +823,7 @@ public void testCloseExpired() throws Exception { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( - Matchers.any(SocketAddress.class), Matchers.any(SocketAddress.class), + Matchers.any(SocketAddress.class), Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest1, sessionRequest2); -@@ -880,7 +884,7 @@ public class TestNIOConnPool { +@@ -879,7 +879,7 @@ public void testCloseIdle() throws Exception { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( - Matchers.any(SocketAddress.class), Matchers.any(SocketAddress.class), + Matchers.any(SocketAddress.class), Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest1, sessionRequest2); -@@ -945,7 +949,7 @@ public class TestNIOConnPool { +@@ -944,7 +944,7 @@ public void testLeaseRequestTimeout() throws Exception { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( - Matchers.any(SocketAddress.class), Matchers.any(SocketAddress.class), + Matchers.any(SocketAddress.class), Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest1); -@@ -1049,7 +1053,7 @@ public class TestNIOConnPool { +@@ -1048,7 +1048,7 @@ public void testLeaseRequestCanceled() throws Exception { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( - Matchers.any(SocketAddress.class), Matchers.any(SocketAddress.class), + Matchers.any(SocketAddress.class), Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest1); - Mockito.when(ioreactor.getStatus()).thenReturn(IOReactorStatus.ACTIVE); -@@ -1083,7 +1087,7 @@ public class TestNIOConnPool { + Mockito.when(ioReactor.getStatus()).thenReturn(IOReactorStatus.ACTIVE); +@@ -1082,7 +1082,7 @@ public void testLeaseRequestCanceledWhileConnecting() throws Exception { - final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class); - Mockito.when(ioreactor.connect( + final ConnectingIOReactor ioReactor = Mockito.mock(ConnectingIOReactor.class); + Mockito.when(ioReactor.connect( - Matchers.any(SocketAddress.class), Matchers.any(SocketAddress.class), + Matchers.any(SocketAddress.class), Matchers.isNull(), Matchers.any(), Matchers.any(SessionRequestCallback.class))). thenReturn(sessionRequest1); - Mockito.when(ioreactor.getStatus()).thenReturn(IOReactorStatus.ACTIVE); + Mockito.when(ioReactor.getStatus()).thenReturn(IOReactorStatus.ACTIVE); diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java b/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java -index 235915b..c631d46 100644 +index dcb92a629..947b05fa9 100644 --- a/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java +++ b/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java -@@ -503,8 +503,8 @@ public class TestHttpAsyncService { +@@ -502,8 +502,8 @@ public void testEntityEnclosingRequestContinueWithoutVerification() throws Excep Mockito.verify(this.conn).submitResponse(Matchers.argThat(new ArgumentMatcher() { @Override @@ -329,7 +325,7 @@ index 235915b..c631d46 100644 return status == 100; } -@@ -1020,8 +1020,8 @@ public class TestHttpAsyncService { +@@ -1019,8 +1019,8 @@ public void testResponseContinue() throws Exception { Mockito.verify(this.conn).submitResponse(Matchers.argThat(new ArgumentMatcher() { @Override @@ -341,5 +337,5 @@ index 235915b..c631d46 100644 } -- -2.19.1 +2.21.0 diff --git a/0001-Re-generated-expired-test-certificates.patch b/0001-Re-generated-expired-test-certificates.patch deleted file mode 100644 index a8db7fff441f0d3003288d3a9d4a3f85b23567fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21328 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 M&I;jSg`lDRKjLV_MF0Q* diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec index c88011c..3d07714 100644 --- a/httpcomponents-core.spec +++ b/httpcomponents-core.spec @@ -5,9 +5,7 @@ Release: 1%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ Source0: http://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-%{version}-src.tar.gz -# Expired test certificates. Backported from upstream commit 8caeb927a. -Patch0: 0001-Re-generated-expired-test-certificates.patch -Patch1: 0002-Port-to-mockito-2.patch +Patch0: 0001-Port-to-mockito-2.patch BuildArch: noarch @@ -43,9 +41,7 @@ Summary: API documentation for %{name} %prep %setup -q - %patch0 -p1 -%patch1 -p1 # Random test failures on ARM -- 100 ms sleep is not eneough on this # very performant arch, lets make it 2 s