Repository: incubator-unomi Updated Branches: refs/heads/master 34e27f03f -> 4f834b23e
Revert "Attempting to fix the integration tests that are blocking the release" This reverts commit 34e27f0 Signed-off-by: Serge Huber <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/4f834b23 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/4f834b23 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/4f834b23 Branch: refs/heads/master Commit: 4f834b23e66bacf0f5f343e6314a862d2638afda Parents: 34e27f0 Author: Serge Huber <[email protected]> Authored: Tue Jun 12 11:15:43 2018 +0200 Committer: Serge Huber <[email protected]> Committed: Tue Jun 12 11:15:43 2018 +0200 ---------------------------------------------------------------------- .../src/test/java/org/apache/unomi/itests/ProfileExportIT.java | 2 +- .../java/org/apache/unomi/itests/ProfileImportActorsIT.java | 2 +- .../java/org/apache/unomi/itests/ProfileImportRankingIT.java | 2 +- .../java/org/apache/unomi/itests/ProfileImportSurfersIT.java | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/4f834b23/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java index 6154c21..eecb3c6 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java @@ -99,7 +99,7 @@ public class ProfileExportIT extends BaseIT { exportConfiguration.getProperties().put("mapping", mapping); exportConfiguration.getProperties().put("segment", "exportItSeg"); - exportConfiguration.getProperties().put("period", "500"); + exportConfiguration.getProperties().put("period", "10m"); exportDir = new File("data/tmp/recurrent_export/"); exportConfiguration.getProperties().put("destination", "file://" + exportDir.getAbsolutePath() + "?fileName=profiles-actors-export.csv"); exportConfiguration.setActive(true); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/4f834b23/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java index 8b233d8..a25fbd1 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java @@ -95,7 +95,7 @@ public class ProfileImportActorsIT extends BaseIT { importConfigActors.getProperties().put("mapping", mappingActors); File importSurfersFile = new File("data/tmp/recurrent_import/"); - importConfigActors.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=6-actors-test.csv&move=.done"); + importConfigActors.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=6-actors-test.csv&consumer.delay=10m&move=.done"); importConfigActors.setActive(true); importConfigurationService.save(importConfigActors, true); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/4f834b23/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java index c8c9a75..7641348 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java @@ -97,7 +97,7 @@ public class ProfileImportRankingIT extends BaseIT { importConfigRanking.getProperties().put("mapping", mappingRanking); File importSurfersFile = new File("data/tmp/recurrent_import/"); - importConfigRanking.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=5-ranking-test.csv&move=.done"); + importConfigRanking.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=5-ranking-test.csv&consumer.delay=10m&move=.done"); importConfigRanking.setActive(true); importConfigurationService.save(importConfigRanking, true); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/4f834b23/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java index ffcec12..d1ee1ad 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java @@ -93,7 +93,7 @@ public class ProfileImportSurfersIT extends BaseIT { importConfigSurfers.getProperties().put("mapping", mappingSurfers); File importSurfersFile = new File("data/tmp/recurrent_import/"); - importConfigSurfers.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=2-surfers-test.csv&move=.done"); + importConfigSurfers.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=2-surfers-test.csv&consumer.delay=10m&move=.done"); importConfigSurfers.setActive(true); importConfigurationService.save(importConfigSurfers, true); @@ -139,7 +139,7 @@ public class ProfileImportSurfersIT extends BaseIT { importConfigSurfersOverwrite.setHasDeleteColumn(true); importConfigSurfersOverwrite.getProperties().put("mapping", mappingSurfers); - importConfigSurfersOverwrite.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=3-surfers-overwrite-test.csv&move=.done"); + importConfigSurfersOverwrite.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=3-surfers-overwrite-test.csv&consumer.delay=10m&move=.done"); importConfigSurfersOverwrite.setActive(true); importConfigurationService.save(importConfigSurfersOverwrite, true); @@ -180,7 +180,7 @@ public class ProfileImportSurfersIT extends BaseIT { importConfigSurfersDelete.getProperties().put("mapping", mappingSurfers); - importConfigSurfersDelete.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=4-surfers-delete-test.csv&move=.done"); + importConfigSurfersDelete.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=4-surfers-delete-test.csv&consumer.delay=10m&move=.done"); importConfigSurfersDelete.setActive(true); importConfigurationService.save(importConfigSurfersDelete, true);
