Repository: usergrid Updated Branches: refs/heads/hotfix-20170728 cbc400651 -> b2705cf36
fix astayanax drop keyspace during test setup Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b2705cf3 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b2705cf3 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/b2705cf3 Branch: refs/heads/hotfix-20170728 Commit: b2705cf36dafed183f1c5faa79560998854ea130 Parents: cbc4006 Author: Mike Dunker <mdun...@google.com> Authored: Wed Aug 9 13:10:49 2017 -0700 Committer: Mike Dunker <mdun...@google.com> Committed: Wed Aug 9 13:10:49 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/usergrid/persistence/CoreSchemaManager.java | 2 +- .../java/org/apache/usergrid/setup/ConcurrentProcessSingleton.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/b2705cf3/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java index ce98735..606d543 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java @@ -57,7 +57,7 @@ public class CoreSchemaManager implements SchemaManager { @Override public void create(boolean dropKeyspace) { try { - setup.initSchema(); + setup.initSchema(dropKeyspace); lockManager.setup(); } catch ( Exception ex ) { http://git-wip-us.apache.org/repos/asf/usergrid/blob/b2705cf3/stack/test-utils/src/main/java/org/apache/usergrid/setup/ConcurrentProcessSingleton.java ---------------------------------------------------------------------- diff --git a/stack/test-utils/src/main/java/org/apache/usergrid/setup/ConcurrentProcessSingleton.java b/stack/test-utils/src/main/java/org/apache/usergrid/setup/ConcurrentProcessSingleton.java index 3b08bc8..5363381 100644 --- a/stack/test-utils/src/main/java/org/apache/usergrid/setup/ConcurrentProcessSingleton.java +++ b/stack/test-utils/src/main/java/org/apache/usergrid/setup/ConcurrentProcessSingleton.java @@ -98,7 +98,7 @@ public class ConcurrentProcessSingleton { // create our schema logger.info("Creating database"); - schemaManager.create(); + schemaManager.create(CLEAN_STORAGE); logger.info( "Populating database" ); schemaManager.populateBaseData();