geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sai_boorlaga...@apache.org
Subject [geode] branch develop updated: GEODE-5212: Fix ExportLogsStatsDunit on windows (#2192)
Date Wed, 25 Jul 2018 22:03:17 GMT
This is an automated email from the ASF dual-hosted git repository.

sai_boorlagadda pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new a3ddf3d  GEODE-5212: Fix ExportLogsStatsDunit on windows (#2192)
a3ddf3d is described below

commit a3ddf3db6a4c8d6ca6dac5e30c38ef3168463807
Author: Sai Boorlagadda <sai.boorlagadda@gmail.com>
AuthorDate: Wed Jul 25 15:03:12 2018 -0700

    GEODE-5212: Fix ExportLogsStatsDunit on windows (#2192)
---
 .../cli/commands/ExportLogsStatsDUnitTest.java        | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
index d976efb..eebfab3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
@@ -20,6 +20,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARC
 import static org.apache.geode.management.internal.cli.commands.ExportLogsCommand.ONLY_DATE_FORMAT;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.io.File;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -68,8 +69,10 @@ public class ExportLogsStatsDUnitTest {
     serverProperties.setProperty(STATISTIC_ARCHIVE_FILE, "statistics.gfs");
     lsRule.startServerVM(1, serverProperties, locator.getPort());
 
-    expectedZipEntries = Sets.newHashSet("locator-0/locator-0.log", "server-1/server-1.log",
-        "server-1/statistics.gfs");
+    expectedZipEntries = Sets.newHashSet(
+        "locator-0" + File.separator + "locator-0.log",
+        "server-1" + File.separator + "server-1.log",
+        "server-1" + File.separator + "statistics.gfs");
   }
 
   protected void connectIfNeeded() throws Exception {
@@ -85,8 +88,10 @@ public class ExportLogsStatsDUnitTest {
     String zipPath = getZipPathFromCommandResult(connector.getGfshOutput());
     Set<String> actualZipEnries = getZipEntries(zipPath);
 
-    Set<String> expectedFiles = Sets.newHashSet("locator-0/locator-0.log", "server-1/server-1.log",
-        "server-1/statistics.gfs");
+    Set<String> expectedFiles = Sets.newHashSet(
+        "locator-0" + File.separator + "locator-0.log",
+        "server-1" + File.separator + "server-1.log",
+        "server-1" + File.separator + "statistics.gfs");
     assertThat(actualZipEnries).containsAll(expectedFiles);
     // remove pulse.log if present
     actualZipEnries =
@@ -101,7 +106,9 @@ public class ExportLogsStatsDUnitTest {
     String zipPath = getZipPathFromCommandResult(connector.getGfshOutput());
     Set<String> actualZipEnries = getZipEntries(zipPath);
 
-    Set<String> expectedFiles = Sets.newHashSet("locator-0/locator-0.log", "server-1/server-1.log");
+    Set<String> expectedFiles = Sets.newHashSet(
+        "locator-0" + File.separator + "locator-0.log",
+        "server-1" + File.separator + "server-1.log");
     assertThat(actualZipEnries).containsAll(expectedFiles);
     // remove pulse.log if present
     actualZipEnries =
@@ -116,7 +123,7 @@ public class ExportLogsStatsDUnitTest {
     String zipPath = getZipPathFromCommandResult(connector.getGfshOutput());
     Set<String> actualZipEnries = getZipEntries(zipPath);
 
-    Set<String> expectedFiles = Sets.newHashSet("server-1/statistics.gfs");
+    Set<String> expectedFiles = Sets.newHashSet("server-1" + File.separator + "statistics.gfs");
     assertThat(actualZipEnries).isEqualTo(expectedFiles);
   }
 


Mime
View raw message