Author: kwright
Date: Sun May 3 11:21:30 2020
New Revision: 1877319
URL: http://svn.apache.org/viewvc?rev=1877319&view=rev
Log:
Get IT test working with modern ES version
Modified:
manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml
manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java
Modified: manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml?rev=1877319&r1=1877318&r2=1877319&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml
(original)
+++ manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml Sun
May 3 11:21:30 2020
@@ -40,23 +40,6 @@
<os family="unix" />
</condition>
- <target name="download-mapper-attachments">
- <property name="elasticsearch-package" value="org/elasticsearch"/>
-
- <!-- download and install the attachment plugin -->
- <mkdir
dir="test-materials/elasticsearch-${elasticsearch.version}/plugins"/>
-
- <antcall target="download-via-maven">
- <param name="project-path" value="${elasticsearch-package}"/>
- <param name="artifact-version"
value="${elasticsearch.mapper-attachments.version}"/>
- <param name="target" value="build/download"/>
- <param name="artifact-name"
value="elasticsearch-mapper-attachments"/>
- <param name="artifact-type" value="zip"/>
- </antcall>
-
- <unzip
src="build/downloads/elasticsearch-${elasticsearch.mapper-attachments.version}/elasticsearch-mapper-attachments-${elasticsearch.mapper-attachments.version}.zip"
dest="test-materials/elasticsearch-${elasticsearch.version}/plugins/mapper-attachments"/>
- </target>
-
<target name="download-elasticsearch-unix" if="isUnix">
<mkdir dir="build/download"/>
<get
src="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${elasticsearch.version}-linux-x86_64.tar.gz";
@@ -75,13 +58,11 @@
<target name="download-elasticsearch"
depends="download-elasticsearch-unix,download-elasticsearch-windows">
</target>
- <target name="download-dependencies"
depends="download-mapper-attachments,download-elasticsearch">
+ <target name="download-dependencies" depends="download-elasticsearch">
<chmod dir="test-materials/elasticsearch-${elasticsearch.version}"
perm="ugo+rxw">
<fileset dir="**/*"/>
</chmod>
- <chmod
file="test-materials/elasticsearch-${elasticsearch.version}/bin/plugin"
perm="ugo+rx"/>
<chmod
file="test-materials/elasticsearch-${elasticsearch.version}/bin/elasticsearch"
perm="ugo+rx"/>
- <chmod
file="test-materials/elasticsearch-${elasticsearch.version}/bin/elasticsearch.in.sh"
perm="ugo+rx"/>
</target>
<target name="download-cleanup">
Modified:
manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java?rev=1877319&r1=1877318&r2=1877319&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java
(original)
+++
manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java
Sun May 3 11:21:30 2020
@@ -93,7 +93,7 @@ public class BaseITHSQLDB extends org.ap
System.out.println("Windows process");
}
- File log = new File("log");
+ File log = new File("es.log");
pb.redirectErrorStream(true);
pb.redirectOutput(ProcessBuilder.Redirect.appendTo(log));
esTestProcess = pb.start();
@@ -106,9 +106,9 @@ public class BaseITHSQLDB extends org.ap
}
public void waitForElasticSearch() {
- for (int i = 0 ; i < 10 ; i++) {
+ for (int i = 0 ; i < 10000 ; i++) {
CloseableHttpClient httpclient = HttpClients.createDefault();
- HttpGet httpGet = new HttpGet("http://127.0.0.1:9200/";);
+ HttpGet httpGet = new HttpGet("http://127.0.0.1:9200";);
try {
CloseableHttpResponse response1 = httpclient.execute(httpGet);
try {
