From ba70b90bc8e7544f6e3e1c08ceb40b330b61772b Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mon, 10 Mar 2014 19:18:27 +0100 Subject: [PATCH] Disable tests that fail outside the Central European time zone --- voms-api-java-timezone-dep-test.patch | 84 +++++++++++++++++++++++++++ voms-api-java.spec | 10 +++- 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 voms-api-java-timezone-dep-test.patch diff --git a/voms-api-java-timezone-dep-test.patch b/voms-api-java-timezone-dep-test.patch new file mode 100644 index 0000000..c37f303 --- /dev/null +++ b/voms-api-java-timezone-dep-test.patch @@ -0,0 +1,84 @@ +diff -ur voms-api-java-3_0_2.orig/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java voms-api-java-3_0_2/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java +--- voms-api-java-3_0_2.orig/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java 2013-10-17 16:29:07.000000000 +0200 ++++ voms-api-java-3_0_2/src/test/java/org/italiangrid/voms/test/ac/TestACGeneration.java 2014-03-10 18:40:57.972237793 +0100 +@@ -259,43 +259,43 @@ + assertEquals(validatedAttrs.size(),0); + } + +- @Test +- public void testExpiredAACertValidationFailure() throws OperatorCreationException{ +- +- ValidationResultChecker c = new ValidationResultChecker(false, +- expiredCertErrorMessage, +- expiredCertCRLErrorMessage, +- newErrorMessage(invalidAcCert), +- newErrorMessage(aaCertNotFound)); +- +- +- VOMSACValidator validator = VOMSValidators.newValidator(trustStore, certValidator, c); +- AttributeCertificate ac = createAC(expiredCredential, +- Arrays.asList("/test.vo.1"), +- defaultGAs, +- defaultVO, +- "test-expired.cnaf.infn.it"); +- +- List validatedAttrs = validator.validateACs(Arrays.asList(ac)); +- assertEquals(validatedAttrs.size(),0); +- } +- +- @Test +- public void testRevokedAACertValidationFailure(){ +- ValidationResultChecker c = new ValidationResultChecker(false, +- revokedCertErrorMessage, +- newErrorMessage(invalidAcCert), +- newErrorMessage(aaCertNotFound)); +- +- VOMSACValidator validator = VOMSValidators.newValidator(trustStore, certValidator, c); +- AttributeCertificate ac = createAC(revokedCredential, +- Arrays.asList("/test.vo.1"), +- defaultGAs, +- defaultVO, +- "test-revoked.cnaf.infn.it"); +- List validatedAttrs = validator.validateACs(Arrays.asList(ac)); +- assertEquals(validatedAttrs.size(),0); +- } ++ // @Test ++ // public void testExpiredAACertValidationFailure() throws OperatorCreationException{ ++ // ++ // ValidationResultChecker c = new ValidationResultChecker(false, ++ // expiredCertErrorMessage, ++ // expiredCertCRLErrorMessage, ++ // newErrorMessage(invalidAcCert), ++ // newErrorMessage(aaCertNotFound)); ++ // ++ // ++ // VOMSACValidator validator = VOMSValidators.newValidator(trustStore, certValidator, c); ++ // AttributeCertificate ac = createAC(expiredCredential, ++ // Arrays.asList("/test.vo.1"), ++ // defaultGAs, ++ // defaultVO, ++ // "test-expired.cnaf.infn.it"); ++ // ++ // List validatedAttrs = validator.validateACs(Arrays.asList(ac)); ++ // assertEquals(validatedAttrs.size(),0); ++ // } ++ ++ // @Test ++ // public void testRevokedAACertValidationFailure(){ ++ // ValidationResultChecker c = new ValidationResultChecker(false, ++ // revokedCertErrorMessage, ++ // newErrorMessage(invalidAcCert), ++ // newErrorMessage(aaCertNotFound)); ++ // ++ // VOMSACValidator validator = VOMSValidators.newValidator(trustStore, certValidator, c); ++ // AttributeCertificate ac = createAC(revokedCredential, ++ // Arrays.asList("/test.vo.1"), ++ // defaultGAs, ++ // defaultVO, ++ // "test-revoked.cnaf.infn.it"); ++ // List validatedAttrs = validator.validateACs(Arrays.asList(ac)); ++ // assertEquals(validatedAttrs.size(),0); ++ // } + + @Test + public void testSuccesfullACExtractionFromProxy(){ diff --git a/voms-api-java.spec b/voms-api-java.spec index dff1f44..cb41780 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,14 +1,18 @@ Name: voms-api-java Version: 3.0.2 %global tagver %(tr . _ <<< %{version}) -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java API Group: Development/Libraries License: ASL 2.0 URL: https://wiki.italiangrid.it/VOMS Source0: https://github.com/italiangrid/%{name}/archive/%{tagver}.tar.gz +# Patch for bouncycastle 1.47+ (Fedora 21+, EPEL 7+) Patch0: %{name}-bc147.patch +# Disable tests that fail outside the Central European time zone +# https://github.com/italiangrid/voms-api-java/issues/8 +Patch1: %{name}-timezone-dep-test.patch BuildArch: noarch BuildRequires: maven-local @@ -58,6 +62,7 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 7 %patch0 -p1 %endif +%patch1 -p1 %if %{?fedora}%{!?fedora:0} %pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:groupId='com.mycila.maven-license-plugin']/pom:configuration/pom:excludes" ".xmvn/**" @@ -88,6 +93,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %doc LICENSE %changelog +* Mon Mar 10 2014 Mattias Ellert - 3.0.2-2 +- Disable tests that fail outside the Central European time zone + * Sun Mar 09 2014 Mattias Ellert - 3.0.2-1 - Update to version 3 - Apply patch for bouncycastle 1.47+ on Fedora 21+ and EPEL 7+