[Phex-svn] SF.net SVN: phex:[4473] phex/trunk/src

[<gr...@us...>]

Revision: 4473
          http://phex.svn.sourceforge.net/phex/?rev=4473&view=rev
Author:   gregork
Date:     2009-07-24 19:32:32 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
try to fix update test

Modified Paths:
--------------
    phex/trunk/src/main/java/phex/common/OpenPgpToolkit.java
    phex/trunk/src/test/java/phex/update/UpdateCheckRunnerTest.java

Modified: phex/trunk/src/main/java/phex/common/OpenPgpToolkit.java
===================================================================
--- phex/trunk/src/main/java/phex/common/OpenPgpToolkit.java	2009-07-23 21:49:34 UTC (rev 4472)
+++ phex/trunk/src/main/java/phex/common/OpenPgpToolkit.java	2009-07-24 19:32:32 UTC (rev 4473)
@@ -41,14 +41,14 @@
     private static final List<String> KEYSERVER_LIST = Arrays.asList( new String[] {
         "gpg-keyserver.de", 
         "keyserver.pramberger.at",
-        "keys.nayr.net", 
+        /* (fails 2009-07-24 "keys.nayr.net",*/
         /* (fails 2009-05-14 "keyserver.mine.nu",*/ 
         "minsky.surfnet.nl", 
         "keyserver.linux.it",
         "keyserver.fabbione.net",
         "keyserver.hadiko.de",
         "nicpgp2.nic.ad.jp",
-        /* (fails 2009-07-23 "pgp.srv.ualberta.ca",*/
+        "pgp.srv.ualberta.ca",
         "pgpkeys.pca.dfn.de"
     } );
     

Modified: phex/trunk/src/test/java/phex/update/UpdateCheckRunnerTest.java
===================================================================
--- phex/trunk/src/test/java/phex/update/UpdateCheckRunnerTest.java	2009-07-23 21:49:34 UTC (rev 4472)
+++ phex/trunk/src/test/java/phex/update/UpdateCheckRunnerTest.java	2009-07-24 19:32:32 UTC (rev 4473)
@@ -1,7 +1,9 @@
 package phex.update;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
@@ -30,10 +32,11 @@
         Servent.getInstance();
     }
     
-    public void testPublicKeyAvailability() throws IOException
+    public void testPublicKeyAvailability()
     {
         OpenPgpToolkit pgpKit = new OpenPgpToolkit();
         List<String> keyServerList = pgpKit.getKeyserverList();
+        Map<String, IOException> failedServers = new HashMap<String, IOException>();
         for ( String keyserver : keyServerList )
         {
             logger.debug( "Testing: " + keyserver );
@@ -48,8 +51,12 @@
             {
                 logger.error( exp.toString() );
                 logger.warn( "Failed: " + keyserver );
-                Assert.fail( "Failed to reach " + keyserver + " - " + exp.toString() );
+                failedServers.put( keyserver, exp );
             }
         }
+        if ( failedServers.size() >= 2 )
+        {
+            Assert.fail( "Failed to reach: " + failedServers.toString() );
+        }
     }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.