From d5a4ff0e2905ee4f3481a1b28ca5ec94d7da38dc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Fri, 4 Jul 2014 01:29:27 +0200
Subject: [PATCH 1/1] Fix killing of the test mail reciever

---
 tests/org/cacert/gigi/testUtils/ManagedTest.java    |  2 +-
 .../cacert/gigi/testUtils/TestEmailReciever.java    | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 9b77f87c..a9e10015 100644
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -139,12 +139,12 @@ public class ManagedTest {
 	@AfterClass
 	public static void tearDownServer() {
 		String type = testProps.getProperty("type");
+		ter.destroy();
 		if (type.equals("local")) {
 			return;
 		}
 		gigi.destroy();
 	}
-
 	@After
 	public void removeMails() {
 		ter.reset();
diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
index 58b4b89c..d9ffdf3f 100644
--- a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
+++ b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
@@ -92,7 +92,9 @@ public class TestEmailReciever implements Runnable {
 				}
 			}
 		} catch (IOException e) {
-			e.printStackTrace();
+			if (!closed) {
+				e.printStackTrace();
+			}
 		}
 
 	}
@@ -108,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();
+		}
+	}
 
 }
-- 
2.39.2