From c7ebb2407112b8137e2cd7c108dd13957b4cff1e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 28 Sep 2011 20:44:23 -0400
Subject: [PATCH] Allow SSL renegotiation on Java 1.6.0_22 and later
---
tests/com/gitblit/tests/FederationTests.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/com/gitblit/tests/FederationTests.java b/tests/com/gitblit/tests/FederationTests.java
index 28b089f..c5f7e8d 100644
--- a/tests/com/gitblit/tests/FederationTests.java
+++ b/tests/com/gitblit/tests/FederationTests.java
@@ -24,6 +24,7 @@
import junit.framework.TestCase;
import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.Constants.FederationProposalResult;
import com.gitblit.Constants.FederationRequest;
import com.gitblit.Constants.FederationToken;
import com.gitblit.FederationServlet;
@@ -91,14 +92,15 @@
"testtoken", repositories);
// propose federation
- assertTrue("proposal refused",
- FederationUtils.propose("http://localhost:" + port, proposal));
+ assertEquals("proposal refused",
+ FederationUtils.propose("http://localhost:" + port, proposal),
+ FederationProposalResult.NO_PROPOSALS);
}
public void testPullRepositories() throws Exception {
try {
- String url = FederationServlet.asFederationLink("http://localhost:" + port, "testtoken",
- FederationRequest.PULL_REPOSITORIES);
+ String url = FederationServlet.asFederationLink("http://localhost:" + port,
+ "testtoken", FederationRequest.PULL_REPOSITORIES);
String json = FederationUtils.readJson(url);
} catch (IOException e) {
if (!e.getMessage().contains("403")) {
--
Gitblit v1.9.1