From 43a5b7725602aa6f63b390284c97d32b361dae5b Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Wed, 3 Feb 2016 20:55:25 -0800
Subject: [PATCH] Ensure logback is reset after test

Update SpringBootJoranConfiguratorTests to ensure that logback
is left in a sane state. Prior to this commit, running all tests
in eclipse would fail due to ErrorPageFilterTests expecting
specific log output.
---
 .../logging/logback/SpringBootJoranConfiguratorTests.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java
index 692518591a..a00c654835 100644
--- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.logging.logback;
 
+import ch.qos.logback.classic.BasicConfigurator;
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
 import ch.qos.logback.core.joran.spi.JoranException;
@@ -69,7 +70,8 @@ public class SpringBootJoranConfiguratorTests {
 
 	@After
 	public void reset() {
-		this.context.reset();
+		this.context.stop();
+		BasicConfigurator.configureDefaultContext();
 	}
 
 	@Test