Repository: chukwa Updated Branches: refs/heads/master 7bd52b278 -> 8329221c4
CHUKWA-801. Increase measurement timeout for TestFailTailer. (Eric Yang) Project: http://git-wip-us.apache.org/repos/asf/chukwa/repo Commit: http://git-wip-us.apache.org/repos/asf/chukwa/commit/8329221c Tree: http://git-wip-us.apache.org/repos/asf/chukwa/tree/8329221c Diff: http://git-wip-us.apache.org/repos/asf/chukwa/diff/8329221c Branch: refs/heads/master Commit: 8329221c48c9d5846e6792031be7ec148b06fe08 Parents: 7bd52b2 Author: Eric Yang <[email protected]> Authored: Sun Mar 20 10:14:14 2016 -0700 Committer: Eric Yang <[email protected]> Committed: Sun Mar 20 10:14:14 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ .../chukwa/datacollection/adaptor/filetailer/TestFileTailer.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/chukwa/blob/8329221c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index fbc443b..203e95c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,10 @@ Trunk (unreleased changes) BUGS + CHUKWA-801. Increase measurement timeout for TestFailTailer. (Eric Yang) + + CHUKWA-800. Updated Hadoop, HBase version. (Eric Yang) + CHUKWA-799. Updated jsoup version. (Eric Yang) CHUKWA-798. Added retry logic for SolrWriter and update to Solr 5.5.0 API (Eric Yang) http://git-wip-us.apache.org/repos/asf/chukwa/blob/8329221c/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java b/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java index d622b5d..54c4b83 100644 --- a/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java +++ b/src/test/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/TestFileTailer.java @@ -46,6 +46,7 @@ public class TestFileTailer { @Test public void testDontSleepIfHasMoreData() throws AlreadyRunningException, IOException, InterruptedException { + int DEFAULT_SAMPLE_PERIOD_MS = 1000 * 2; ChukwaConfiguration cc = new ChukwaConfiguration(); cc.setInt("chukwaAgent.fileTailingAdaptor.maxReadSize", 18); // small in order to have hasMoreData=true // (with 26 letters we should have 2 chunks) @@ -66,7 +67,7 @@ public class TestFileTailer { chunks.waitForAChunk(); long endTime = System.currentTimeMillis(); - assertTrue( endTime - startTime < 300 ); // ensure that everything finishes very fast + assertTrue( endTime - startTime < DEFAULT_SAMPLE_PERIOD_MS ); // ensure that everything finishes very fast // faster than SAMPLE_PERIOD_MS (ie: we don't sleep) }
