You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/12/01 15:25:59 UTC
[29/29] usergrid git commit: Update tools to use 2.1.1 and add
missing ES args to two export tools.
Update tools to use 2.1.1 and add missing ES args to two export tools.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/bfeb91b4
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/bfeb91b4
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/bfeb91b4
Branch: refs/heads/USERGRID-872
Commit: bfeb91b48c4e33649937372c307465dcd1c407fb
Parents: 668a801
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Dec 1 09:25:18 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Dec 1 09:25:18 2015 -0500
----------------------------------------------------------------------
stack/tools/pom.xml | 2 +-
.../test/java/org/apache/usergrid/tools/ExportAppTest.java | 9 ++++++---
.../org/apache/usergrid/tools/ExportImportAdminsTest.java | 6 ++++--
3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/bfeb91b4/stack/tools/pom.xml
----------------------------------------------------------------------
diff --git a/stack/tools/pom.xml b/stack/tools/pom.xml
index 0e20e91..6b65268 100644
--- a/stack/tools/pom.xml
+++ b/stack/tools/pom.xml
@@ -29,7 +29,7 @@
<name>Usergrid Tools</name>
<description>Command line tools for Usergrid system.</description>
<packaging>jar</packaging>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.1-SNAPSHOT</version>
<reporting>
<plugins>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/bfeb91b4/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java b/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java
index 890c972..7b7272e 100644
--- a/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java
+++ b/stack/tools/src/test/java/org/apache/usergrid/tools/ExportAppTest.java
@@ -29,6 +29,7 @@ import java.io.FileFilter;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import org.apache.usergrid.StressTest;
/**
* TODO: better test, this is really just a smoke test.
@@ -55,9 +56,11 @@ public class ExportAppTest {
ExportDataCreator creator = new ExportDataCreator();
creator.startTool( new String[] {
- "-organization", orgName,
- "-application", appName,
- "-host", "localhost:9120"
+ "-organization", orgName,
+ "-application", appName,
+ "-host", "localhost:9120",
+ "-eshost", "localhost:9200",
+ "-escluster", "usergrid"
}, false);
long start = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/bfeb91b4/stack/tools/src/test/java/org/apache/usergrid/tools/ExportImportAdminsTest.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/test/java/org/apache/usergrid/tools/ExportImportAdminsTest.java b/stack/tools/src/test/java/org/apache/usergrid/tools/ExportImportAdminsTest.java
index 23ff096..5573279 100644
--- a/stack/tools/src/test/java/org/apache/usergrid/tools/ExportImportAdminsTest.java
+++ b/stack/tools/src/test/java/org/apache/usergrid/tools/ExportImportAdminsTest.java
@@ -216,8 +216,10 @@ public class ExportImportAdminsTest {
ImportAdmins importAdmins = new ImportAdmins();
importAdmins.startTool( new String[]{
- "-host", "localhost:9120",
- "-inputDir", tempDir.getAbsolutePath()
+ "-host", "localhost:9120",
+ "-eshost", "localhost:9200",
+ "-escuster", "usergrid",
+ "-inputDir", tempDir.getAbsolutePath()
}, false );
// verify that users and orgs were created correctly