Disable failing multi-thread test

Disable tests using obsolete hashes (md5/sha1)
This commit is contained in:
Mattias Ellert 2022-09-28 15:51:24 +02:00
commit 6673df8150
4 changed files with 127 additions and 6 deletions

View file

@ -0,0 +1,35 @@
diff --git a/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java b/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java
index 6f57833..aa800ac 100644
--- a/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java
+++ b/src/test/java/org/italiangrid/voms/test/TestOpensslHashFunction.java
@@ -47,7 +47,7 @@ public class TestOpensslHashFunction {
cred = new PEMCredential(userKey, userCert, keyPassword.toCharArray());
}
- @Test
+ // @Test
public void testDefaultHashIsMD5() {
CertificateValidatorBuilder builder = new CertificateValidatorBuilder();
@@ -60,7 +60,7 @@ public class TestOpensslHashFunction {
}
- @Test
+ // @Test
public void testSHA1Hash() {
CertificateValidatorBuilder builder = new CertificateValidatorBuilder();
diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
index 8b420a9..df91a02 100644
--- a/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
+++ b/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
@@ -227,7 +227,7 @@ public class TestACValidator implements Fixture {
}
- @Test
+ // @Test
public void testInvalidLSCSignatureFailure() throws Exception {
VOMSAA aa = Utils.getVOMSAA();

View file

@ -0,0 +1,62 @@
diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java b/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
index bc7557c..32ba7a5 100644
--- a/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
+++ b/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
@@ -191,7 +191,7 @@ public class TestACGeneration {
return ga;
}
- @Test
+ // @Test
public void testGeneratedACParsing() throws KeyStoreException,
CertificateException, FileNotFoundException, IOException,
OperatorCreationException {
@@ -230,7 +230,7 @@ public class TestACGeneration {
}
- @Test
+ // @Test
public void testACValidation() {
ValidationResultChecker c = new ValidationResultChecker(true);
@@ -247,7 +247,7 @@ public class TestACGeneration {
}
- @Test
+ // @Test
public void testLSCValidationFailure() {
ValidationResultChecker c = new ValidationResultChecker(false,
@@ -264,7 +264,7 @@ public class TestACGeneration {
assertEquals(validatedAttrs.size(), 0);
}
- @Test
+ // @Test
public void testExpiredAACertValidationFailure()
throws OperatorCreationException {
@@ -284,7 +284,7 @@ public class TestACGeneration {
assertEquals(validatedAttrs.size(), 0);
}
- @Test
+ // @Test
public void testRevokedAACertValidationFailure() {
ValidationResultChecker c = new ValidationResultChecker(false,
diff --git a/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java b/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java
index 6eca55f..49f0498 100644
--- a/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java
+++ b/src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java
@@ -54,7 +54,7 @@ public class TestFakeVOMSACService extends TestACSupport {
initializeCredentials();
}
- @Test
+ // @Test
public void testFakeAcServiceCreation() {
ACGenerationParams params = ACGenerationParams.builder()

View file

@ -0,0 +1,13 @@
diff --git a/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java b/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java
index 496455e..d9b26cc 100644
--- a/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java
+++ b/src/test/java/org/italiangrid/voms/test/mt/TestConcurrentValidation.java
@@ -167,7 +167,7 @@ public class TestConcurrentValidation {
}
- @Test
+ // @Test
public void test() throws InterruptedException, BrokenBarrierException {
long start = System.currentTimeMillis();

View file

@ -6,6 +6,16 @@ Summary: Virtual Organization Membership Service Java API
License: ASL 2.0
URL: https://wiki.italiangrid.it/VOMS
Source0: https://github.com/italiangrid/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
# Disable failing tests
# IllegalState object explicit - implicit expected.
# https://github.com/italiangrid/voms-api-java/issues/29
Patch0: %{name}-disable-some-tests.patch
# Disable failing multi-thread test
Patch1: %{name}-no-mt-test.patch
# Disable tests using obsolete hashes (md5/sha1)
Patch2: %{name}-crypto-policy.patch
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
@ -34,6 +44,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
# Remove unused dependency
%pom_remove_dep net.jcip:jcip-annotations
@ -57,12 +70,6 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
# Remove license plugin
%pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin
# These tests fail due to changes to the ASN1TaggedObject class in
# bouncycastle 1.70 - remove until fixed
# https://github.com/italiangrid/voms-api-java/issues/28
rm src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java
rm src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java
%build
%mvn_build
@ -78,6 +85,10 @@ rm src/test/java/org/italiangrid/voms/test/ac/TestFakeVOMSACService.java
%license LICENSE
%changelog
* Wed Sep 28 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.2-8
- Disable failing multi-thread test
- Disable tests using obsolete hashes (md5/sha1)
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild