Repository: nifi Updated Branches: refs/heads/master 807e1e5c7 -> 5613bf401
NIFI-5202: Fixed timing issue in TestListDatabaseTables This closes #2709 Signed-off-by: Mike Thomsen <mikerthom...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5613bf40 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5613bf40 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5613bf40 Branch: refs/heads/master Commit: 5613bf4012447c4a1dd5e0d969098efcd156fa88 Parents: 807e1e5 Author: Matthew Burgess <mattyb...@apache.org> Authored: Wed May 16 13:26:14 2018 -0400 Committer: Mike Thomsen <mikerthom...@gmail.com> Committed: Thu May 17 07:10:35 2018 -0400 ---------------------------------------------------------------------- .../nifi/processors/standard/TestListDatabaseTables.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/5613bf40/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListDatabaseTables.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListDatabaseTables.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListDatabaseTables.java index 3abde3c..321c6ad 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListDatabaseTables.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListDatabaseTables.java @@ -206,6 +206,7 @@ public class TestListDatabaseTables { runner.setProperty(ListDatabaseTables.INCLUDE_COUNT, "true"); runner.setProperty(ListDatabaseTables.REFRESH_INTERVAL, "200 millis"); runner.run(); + long startTimer = System.currentTimeMillis(); runner.assertTransferCount(ListDatabaseTables.REL_SUCCESS, 1); List<MockFlowFile> results = runner.getFlowFilesForRelationship(ListDatabaseTables.REL_SUCCESS); assertEquals("2", results.get(0).getAttribute(ListDatabaseTables.DB_TABLE_COUNT)); @@ -215,9 +216,11 @@ public class TestListDatabaseTables { stmt.execute("create table TEST_TABLE2 (id integer not null, val1 integer, val2 integer, constraint my_pk2 primary key (id))"); stmt.close(); runner.run(); - runner.assertTransferCount(ListDatabaseTables.REL_SUCCESS, 1); + long endTimer = System.currentTimeMillis(); + // Expect 1 or 2 tables (whether execution has taken longer than the refresh time) + runner.assertTransferCount(ListDatabaseTables.REL_SUCCESS, (endTimer - startTimer > 200) ? 2 : 1); results = runner.getFlowFilesForRelationship(ListDatabaseTables.REL_SUCCESS); - assertEquals("0", results.get(0).getAttribute(ListDatabaseTables.DB_TABLE_COUNT)); + assertEquals((endTimer - startTimer > 200) ? "2": "0", results.get(0).getAttribute(ListDatabaseTables.DB_TABLE_COUNT)); runner.clearTransferState(); // Now wait longer than the refresh interval and assert the refresh has happened (i.e. the two tables are re-listed)
