This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/flume.git
The following commit(s) were added to refs/heads/trunk by this push:
new e6803b7 More diagnostic info
e6803b7 is described below
commit e6803b7953e5fbcf6e9ac427957f5ff0082ec632
Author: Ralph Goers <[email protected]>
AuthorDate: Wed Jan 26 01:05:29 2022 -0700
More diagnostic info
---
.../apache/flume/client/avro/TestReliableSpoolingFileEventReader.java | 2 +-
.../test/java/org/apache/flume/source/TestMultiportSyslogTCPSource.java | 2 +-
.../src/test/java/org/apache/flume/source/TestSyslogUdpSource.java | 2 +-
.../src/test/java/org/apache/flume/source/TestSyslogUtils.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/flume-ng-core/src/test/java/org/apache/flume/client/avro/TestReliableSpoolingFileEventReader.java
b/flume-ng-core/src/test/java/org/apache/flume/client/avro/TestReliableSpoolingFileEventReader.java
index d3bfcf7..d48647d 100644
---
a/flume-ng-core/src/test/java/org/apache/flume/client/avro/TestReliableSpoolingFileEventReader.java
+++
b/flume-ng-core/src/test/java/org/apache/flume/client/avro/TestReliableSpoolingFileEventReader.java
@@ -498,7 +498,7 @@ public class TestReliableSpoolingFileEventReader {
FileUtils.write(file3, "New file3 created.\n");
FileUtils.write(file2, "New file2 created.\n");
FileUtils.write(file1, "New file1 created.\n");
- file1.setLastModified(file3.lastModified());
+ file2.setLastModified(file3.lastModified());
file1.setLastModified(file2.lastModified());
// file ages are same now they need to be ordered
// lexicographically (file1, file2, file3).
diff --git
a/flume-ng-core/src/test/java/org/apache/flume/source/TestMultiportSyslogTCPSource.java
b/flume-ng-core/src/test/java/org/apache/flume/source/TestMultiportSyslogTCPSource.java
index a96b6ea..04cbb08 100644
---
a/flume-ng-core/src/test/java/org/apache/flume/source/TestMultiportSyslogTCPSource.java
+++
b/flume-ng-core/src/test/java/org/apache/flume/source/TestMultiportSyslogTCPSource.java
@@ -578,7 +578,7 @@ public class TestMultiportSyslogTCPSource {
String headerValue = headers.get(headerName);
if (TEST_CLIENT_HOSTNAME_HEADER.equals(headerName)) {
if (!"localhost".equals(headerValue) &&
!"127.0.0.1".equals(headerValue)) {
- fail("Expected either 'localhost' or '127.0.0.1'");
+ fail("Expected either 'localhost' or '127.0.0.1' but got " +
headerValue);
}
} else {
assertEquals("Event header value does not match: " + headerName,
diff --git
a/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUdpSource.java
b/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUdpSource.java
index 6c1fae0..288e286 100644
---
a/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUdpSource.java
+++
b/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUdpSource.java
@@ -316,7 +316,7 @@ public class TestSyslogUdpSource {
String headerValue = headers.get(headerName);
if (TEST_CLIENT_HOSTNAME_HEADER.equals(headerName)) {
if (!"localhost".equals(headerValue) &&
!"127.0.0.1".equals(headerValue)) {
- fail("Expected either 'localhost' or '127.0.0.1'");
+ fail("Expected either 'localhost' or '127.0.0.1' but got " +
headerValue);
}
} else {
assertEquals("Event header value does not match: " + headerName,
diff --git
a/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUtils.java
b/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUtils.java
index f1b8b9a..d22785a 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUtils.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/source/TestSyslogUtils.java
@@ -637,7 +637,7 @@ public class TestSyslogUtils {
String hostname = SyslogUtils.getHostname(socketAddress);
if (!"localhost".equals(hostname) && !"127.0.0.1".equals(hostname)) {
- fail("Expected either 'localhost' or '127.0.0.1'");
+ fail("Expected either 'localhost' or '127.0.0.1' but got '" + hostname +
"'");
}
}
