This is an automated email from the ASF dual-hosted git repository.
sai_boorlagadda pushed a commit to branch feature/GEODE-5212-export-logs
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-5212-export-logs
by this push:
new f5a001d Converted ExportLogsOverHttpIntegrationTest to DistributedTest
f5a001d is described below
commit f5a001d6405c9d4a7f5a2289100b9e9fafbdf940
Author: Sai Boorlagadda <[email protected]>
AuthorDate: Wed Jul 18 14:19:53 2018 -0700
Converted ExportLogsOverHttpIntegrationTest to DistributedTest
Signed-off-by: Jens Deppe <[email protected]>
---
.../geode/management/internal/cli/commands/ExportLogsDUnitTest.java | 6 +++++-
.../internal/cli/commands/ExportLogsOverHttpDistributedTest.java} | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
index ad74a44..8dad218 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
@@ -71,7 +71,7 @@ public class ExportLogsDUnitTest {
@Rule
public GfshCommandRule gfshConnector = new GfshCommandRule();
- private MemberVM locator;
+ protected MemberVM locator;
private MemberVM server1;
private MemberVM server2;
@@ -104,6 +104,10 @@ public class ExportLogsDUnitTest {
});
}
+ connect();
+ }
+
+ public void connect() throws Exception {
gfshConnector.connectAndVerify(locator);
}
diff --git
a/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpDistributedTest.java
similarity index 88%
rename from
geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpDistributedTest.java
index 0fb65cc..9ebd224 100644
---
a/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
+++
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpDistributedTest.java
@@ -23,11 +23,11 @@ import org.apache.geode.test.junit.categories.GfshTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
@Category({GfshTest.class})
-public class ExportLogsOverHttpIntegrationTest extends
ExportLogsIntegrationTest {
+public class ExportLogsOverHttpDistributedTest extends ExportLogsDUnitTest {
@Override
public void connect() throws Exception {
- gfsh.connectAndVerify(locator.getHttpPort(),
GfshCommandRule.PortType.http);
+ gfshConnector.connectAndVerify(locator.getHttpPort(),
GfshCommandRule.PortType.http);
}
public File getWorkingDirectory() throws Exception {