This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Logback: the generic, reliable, fast and flexible logging
framework.".
The branch, encoder has been updated
via 8381bae9d2899def5d9a9420edd2d53811ddba5b (commit)
from 4577cf0a7f55e1162d72691951476d9ae876f0f1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=8381bae9d2899def5d9a9420edd2d53811ddba5b
http://github.com/ceki/logback/commit/8381bae9d2899def5d9a9420edd2d53811ddba5b
commit 8381bae9d2899def5d9a9420edd2d53811ddba5b
Author: Ceki Gulcu <c...@qos.ch>
Date: Sat Feb 27 10:37:22 2010 +0100
Skip the UnknownHostException on Mac. This fixes LBCORE-129
diff --git
a/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java
b/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java
index d7d621c..d242e9f 100644
---
a/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java
+++
b/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java
@@ -38,6 +38,7 @@ import ch.qos.logback.core.joran.spi.JoranException;
import ch.qos.logback.core.joran.spi.Pattern;
import ch.qos.logback.core.status.Status;
import ch.qos.logback.core.status.StatusChecker;
+import ch.qos.logback.core.testUtil.Env;
import ch.qos.logback.core.testUtil.RandomUtil;
import ch.qos.logback.core.util.CoreTestConstants;
import ch.qos.logback.core.util.StatusPrinter;
@@ -75,7 +76,7 @@ public class IncludeActionTest {
static final String INCLUDED_AS_RESOURCE =
"asResource/joran/inclusion/includedAsResource.xml";
int diff = RandomUtil.getPositiveInt();
-
+
public IncludeActionTest() {
HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>();
rulesMap.put(new Pattern("x"), new NOPAction());
@@ -145,22 +146,22 @@ public class IncludeActionTest {
File f = new File(tmpOut);
assertTrue(f.exists());
assertTrue(f.delete());
-
+
}
- String copyToTemp(String in) throws IOException {
+ String copyToTemp(String in) throws IOException {
FileInputStream fis = new FileInputStream(in);
- String out = CoreTestConstants.OUTPUT_DIR_PREFIX+"out"+diff;
+ String out = CoreTestConstants.OUTPUT_DIR_PREFIX + "out" + diff;
FileOutputStream fos = new FileOutputStream(out);
int b;
- while((b=fis.read()) != -1) {
+ while ((b = fis.read()) != -1) {
fos.write(b);
}
fis.close();
fos.close();
return out;
}
-
+
@Test
public void malformedURL() throws JoranException {
System.setProperty(INCLUDE_KEY, "htp://logback.qos.ch");
@@ -176,7 +177,11 @@ public class IncludeActionTest {
tc.doConfigure(TOP_BY_URL);
assertEquals(Status.ERROR, context.getStatusManager().getLevel());
StatusChecker sc = new StatusChecker(context.getStatusManager());
- assertTrue(sc.containsException(UnknownHostException.class));
+ // OS X throws IOException instead of UnknownHostException
+ // http://jira.qos.ch/browse/LBCORE-129
+ if (!Env.isMac()) {
+ assertTrue(sc.containsException(UnknownHostException.class));
+ }
}
@Test
-----------------------------------------------------------------------
Summary of changes:
.../core/joran/action/IncludeActionTest.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
hooks/post-receive
--
Logback: the generic, reliable, fast and flexible logging framework.
_______________________________________________
logback-dev mailing list
logback-dev@qos.ch
http://qos.ch/mailman/listinfo/logback-dev
