[java-idp-testbed COMMIT] /trunk/src/test/java/idp/AbstractFlowTest.java

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Apr 21 13:41:14 2014
New Revision: 192

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=192&view=rev
Log:
Always teardown the in-memory directory server after each test to avoid starting the server multiple times when tests fail.

Modified:
    trunk/src/test/java/idp/AbstractFlowTest.java

Modified: trunk/src/test/java/idp/AbstractFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/AbstractFlowTest.java?rev=192&r1=191&r2=192&view=diff
==============================================================================
--- trunk/src/test/java/idp/AbstractFlowTest.java (original)
+++ trunk/src/test/java/idp/AbstractFlowTest.java Mon Apr 21 13:41:14 2014
@@ -172,9 +172,13 @@
 
     /**
      * Shutdown the in-memory directory server.
-     */
-    @AfterTest public void teardownDirectoryServer() {
-        directoryServer.stop();
+     * 
+     * Always run this method to avoid starting the server multiple times when tests fail.
+     */
+    @AfterTest(alwaysRun=true) public void teardownDirectoryServer() {
+        if (directoryServer != null) {
+            directoryServer.stop();
+        }
     }
 
     /**