X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FTestEmailReciever.java;h=d9ffdf3fd97bbea4548638c97f392827adc2e32a;hb=d5a4ff0e2905ee4f3481a1b28ca5ec94d7da38dc;hp=446d2aad769d59fe5efd55b71f3ebde148eaa23a;hpb=7cf984749cf0027ccae90a53ebef07ab97ff164b;p=gigi.git

diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
index 446d2aad..d9ffdf3f 100644
--- a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
+++ b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
@@ -41,7 +41,7 @@ public class TestEmailReciever implements Runnable {
 			return replyto;
 		}
 		public String extractLink() {
-			Pattern link = Pattern.compile("http://[^\\s]+(?=\\s)");
+			Pattern link = Pattern.compile("https?://[^\\s]+(?=\\s)");
 			Matcher m = link.matcher(getMessage());
 			m.find();
 			return m.group(0);
@@ -81,19 +81,20 @@ public class TestEmailReciever implements Runnable {
 				} else if (type.equals("challengeAddrBox")) {
 					String email = dis.readUTF();
 					if (approveRegex.matcher(email).matches()) {
-						System.out.println("approving mbox: " + email);
 						dos.writeUTF("OK");
 					} else {
-						System.out.println("rejecting mbox: " + email);
 						dos.writeUTF("FAIL");
 					}
 					dos.flush();
+				} else if (type.equals("ping")) {
 				} else {
 					System.err.println("Unknown type: " + type);
 				}
 			}
 		} catch (IOException e) {
-			e.printStackTrace();
+			if (!closed) {
+				e.printStackTrace();
+			}
 		}
 
 	}
@@ -109,5 +110,14 @@ public class TestEmailReciever implements Runnable {
 		clearMails();
 		approveRegex = Pattern.compile(".*");
 	}
+	boolean closed = false;
+	public void destroy() {
+		try {
+			closed = true;
+			s.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
 
 }