You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/08/16 04:56:12 UTC

svn commit: r1373709 - in /camel/branches/camel-2.10.x: ./ components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatElGamalTest.java

Author: ningjiang
Date: Thu Aug 16 02:56:12 2012
New Revision: 1373709

URL: http://svn.apache.org/viewvc?rev=1373709&view=rev
Log:
Merged revisions 1373374 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1373374 | ningjiang | 2012-08-15 20:46:15 +0800 (Wed, 15 Aug 2012) | 1 line
  
  CAMEL-5475 ignore the PGPDataFormatElGamalTest as it is not work with CI
........

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatElGamalTest.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1373374

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.10.x/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatElGamalTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatElGamalTest.java?rev=1373709&r1=1373708&r2=1373709&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatElGamalTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatElGamalTest.java Thu Aug 16 02:56:12 2012
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.converter.crypto;
 
+import org.junit.Ignore;
+
+@Ignore("It looks like the bcpg dosen't work well with the JDK of CI"
++ "The tests are passed in my Mac JDK-1.6.0_33")
 public class PGPDataFormatElGamalTest extends PGPDataFormatTest {
     protected String getKeyFileName() {
         return "org/apache/camel/component/crypto/pubring-ElGamal.gpg";