[java-shib-shared] branch main updated: Supress GITWEB tests for now
Rod Widdowson
rdw at steadingsoftware.com
Sat Jul 5 13:58:56 UTC 2025
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-shib-shared.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=03c1f732dc7a5f3bea5c55126d0c500b1d96e074
The following commit(s) were added to refs/heads/main by this push:
new 03c1f732 Supress GITWEB tests for now
03c1f732 is described below
commit 03c1f732dc7a5f3bea5c55126d0c500b1d96e074
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jul 5 14:58:49 2025 +0100
Supress GITWEB tests for now
---
.../httpclient/resource/ConditionalResourceTest.java | 4 ++--
.../resource/FileBackedHTTPResourceTest.java | 4 ++--
.../spring/httpclient/resource/HTTPResourceTest.java | 18 +++++++++---------
.../spring/httpclient/resource/RepositorySupport.java | 5 ++++-
4 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
index 1108f151..66af1545 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
@@ -51,7 +51,7 @@ public class ConditionalResourceTest {
client = (new HttpClientBuilder()).buildClient();
}
- @Test public void existsTest() throws IOException, ComponentInitializationException {
+ @Test(enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void existsTest() throws IOException, ComponentInitializationException {
final HTTPResource existsHTTPResource = new HTTPResource(client, existsURL);
final HTTPResource notExistsHTTPResource = new HTTPResource(client, nonExistsURL);
@@ -106,7 +106,7 @@ public class ConditionalResourceTest {
Assert.assertTrue(existsResource.exists());
}
- @Test public void testCompare() throws IOException, ComponentInitializationException {
+ @Test(enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void testCompare() throws IOException, ComponentInitializationException {
final HTTPResource existsHTTPResource = new HTTPResource(client, existsURL);
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
index e8d378fa..cd7f6311 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
@@ -70,7 +70,7 @@ public class FileBackedHTTPResourceTest {
Assert.assertFalse(notExistsResource.exists());
}
- @Test public void testCompare() throws IOException {
+ @Test(enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void testCompare() throws IOException {
Assert.assertTrue(ResourceTestHelper.compare(new FileBackedHTTPResource(existsFile, client, existsURL),
new ClassPathResource(documentPath)));
// With that done compare via the backup
@@ -91,7 +91,7 @@ public class FileBackedHTTPResourceTest {
return builder.build();
}
- @Test public void testParsingNew() throws IOException {
+ @Test(enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void testParsingNew() throws IOException {
try (final GenericApplicationContext context = getContext("net/shibboleth/shared/spring/httpclient/resource/newStyle.xml")) {
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java
index e370e1dc..dde07711 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java
@@ -60,7 +60,7 @@ public class HTTPResourceTest {
client = (new HttpClientBuilder()).buildClient();
}
- @Test public void existsTest() throws IOException {
+ @Test(enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void existsTest() throws IOException {
final HTTPResource existsResource = new HTTPResource(client, existsURL);
final HTTPResource notExistsResource = new HTTPResource(client, nonExistsURL);
@@ -68,7 +68,7 @@ public class HTTPResourceTest {
Assert.assertFalse(notExistsResource.exists());
}
- @Test public void contextHandlerNoopTest() throws IOException {
+ @Test(enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void contextHandlerNoopTest() throws IOException {
final HTTPResource existsResource = new HTTPResource(client, existsURL);
existsResource.setHttpClientContextHandler(new HttpClientContextHandler() {
public void invokeBefore(HttpClientContext context, ClassicHttpRequest request) throws IOException {
@@ -106,12 +106,12 @@ public class HTTPResourceTest {
Assert.assertFalse(existsResource.exists());
}
- @Test public void testCompare() throws IOException {
+ @Test(enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void testCompare() throws IOException {
Assert.assertTrue(ResourceTestHelper.compare(new HTTPResource(client, existsURL), new ClassPathResource(documentPath)));
}
- @Test public void testRelated() throws IOException {
+ @Test(enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void testRelated() throws IOException {
// Chose a file unlikely to change. Do not use the svn thing because the date will not be there
@@ -127,7 +127,7 @@ public class HTTPResourceTest {
Assert.assertEquals(size, 20784226L, "Size mismatch");
}
- @Test public void testCachedNoCache() throws IOException, InterruptedException {
+ @Test(enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void testCachedNoCache() throws IOException, InterruptedException {
final TestHTTPResource what = new TestHTTPResource(client, existsURL);
Assert.assertTrue(what.exists());
@@ -136,7 +136,7 @@ public class HTTPResourceTest {
Assert.assertNull(what.getLastCacheResponseStatus());
}
- @Test public void testCachedCache() throws Exception {
+ @Test(enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void testCachedCache() throws Exception {
final InMemoryCachingHttpClientBuilder builder = new InMemoryCachingHttpClientBuilder();
builder.setMaxCacheEntries(3);
@@ -165,7 +165,7 @@ public class HTTPResourceTest {
return context;
}
- @Test public void springLoadMemCache() throws IOException {
+ @Test(enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void springLoadMemCache() throws IOException {
final GenericApplicationContext context =
getContext("classpath:/net/shibboleth/shared/spring/httpclient/resource/MemBackedHTTPBean.xml", null);
@@ -199,7 +199,7 @@ public class HTTPResourceTest {
Assert.assertTrue(dir.delete());
}
- @Test public void springLoadFileCache() throws IOException {
+ @Test(enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void springLoadFileCache() throws IOException {
File theDir = null;
GenericApplicationContext context = null;
try {
@@ -229,7 +229,7 @@ public class HTTPResourceTest {
}
}
- @Test(timeOut = 5000) public void testCloseResponse() {
+ @Test(timeOut = 5000, enabled=RepositorySupport.ENABLE_GITWEB_TESTS) public void testCloseResponse() {
// See IDP-969. This test will timeout if the response is not closed.
try (final PoolingHttpClientConnectionManager connMgr = new PoolingHttpClientConnectionManager()) {
final HTTPResource notExistsResource = new HTTPResource(client, nonExistsURL);
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/RepositorySupport.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/RepositorySupport.java
index 82f0ff7f..e1e86379 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/RepositorySupport.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/RepositorySupport.java
@@ -30,6 +30,9 @@ public final class RepositorySupport {
/** Constructor. */
private RepositorySupport() { }
+ /** Temporarily suppress the gitweb tests until we have a long term fix. */
+ public static final boolean ENABLE_GITWEB_TESTS = false;
+
/**
* Build an HTTPS resource URL for the selected repository name and path on the main branch.
*
@@ -81,7 +84,7 @@ public final class RepositorySupport {
}
if (https) {
- return String.format("https://test.shibboleth.net/git/view/?p=%s.git&a=blob_plain&f=%s&hb=%s", repo, path, branch);
+ return String.format("https://git.shibboleth.net/view/?p=%s.git&a=blob_plain&f=%s&hb=%s", repo, path, branch);
}
return String.format("http://git.shibboleth.net/view/?p=%s.git&a=blob_plain&f=%s&hb=%s", repo, path, branch);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list