You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/11/26 03:55:20 UTC
svn commit: r720715 - in
/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests:
AbstractRepositoryReaderM2Test.java
RemoteRepositoryCachingReaderM2Test.java RemoteRepositoryReaderM2Test.java
Author: ogusakov
Date: Tue Nov 25 18:55:19 2008
New Revision: 720715
URL: http://svn.apache.org/viewvc?rev=720715&view=rev
Log:
fixing ITs for the grid
Modified:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java?rev=720715&r1=720714&r2=720715&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java Tue Nov 25 18:55:19 2008
@@ -60,8 +60,20 @@
private static final String publicKeyFile = "/pgp/pubring.gpg";
private static final String secretKeyFile = "/pgp/secring.gpg";
+ boolean goodOs = false;
+
Server server;
HashSet<StreamVerifierFactory> factories;
+
+
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ String os = System.getProperty("os.name");
+ if( "Mac OS X".equals( os ) )
+ goodOs = true;
+ }
//------------------------------------------------------------------------------
public void testReadReleaseVersion()
throws IllegalArgumentException, RepositoryException
@@ -361,7 +373,9 @@
)
);
factories.add( new SHA1VerifierFactory( true, false ) );
- server.setReaderStreamVerifierFactories(factories);
+
+ if( goodOs )
+ server.setReaderStreamVerifierFactories(factories);
bmd = new ArtifactBasicMetadata("a:a:4");
query.add( bmd );
@@ -405,7 +419,9 @@
, getClass().getResourceAsStream( publicKeyFile )
)
);
- server.setReaderStreamVerifierFactories(factories);
+
+ if( goodOs )
+ server.setReaderStreamVerifierFactories(factories);
bmd = new ArtifactBasicMetadata("a:a:3");
query.add( bmd );
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java?rev=720715&r1=720714&r2=720715&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java Tue Nov 25 18:55:19 2008
@@ -97,6 +97,8 @@
reader.setMetadataCache( _mdCache );
+ super.setUp();
+
}
//-------------------------------------------------------------------------
@Override
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java?rev=720715&r1=720714&r2=720715&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java Tue Nov 25 18:55:19 2008
@@ -78,6 +78,8 @@
repo = new RemoteRepositoryM2( "testRepo", server );
repo.setDependencyProcessor( mdProcessor );
reader = repo.getReader();
+
+ super.setUp();
}
//-------------------------------------------------------------------------
@Override