Fix killing of the test mail reciever

[gigi.git] / tests / org / cacert / gigi / testUtils / TestEmailReciever.java

diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
index fca0a095a2c2c3d9b81109f03bdcf06bcd3d4045..d9ffdf3fd97bbea4548638c97f392827adc2e32a 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
+++ b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
@@ -81,10 +81,8 @@ 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();
@@ -94,7 +92,9 @@ public class TestEmailReciever implements Runnable {
                                }
                        }
                } catch (IOException e) {
-                       e.printStackTrace();
+                       if (!closed) {
+                               e.printStackTrace();
+                       }
                }
 
        }
@@ -110,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();
+               }
+       }
 
 }