You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/05/05 20:50:26 UTC
[11/11] incubator-geode git commit: Merge remote-tracking branch
'origin/develop' into feature/GEODE-1276
Merge remote-tracking branch 'origin/develop' into feature/GEODE-1276
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b1482e69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b1482e69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b1482e69
Branch: refs/heads/feature/GEODE-1276
Commit: b1482e6993ad79ec71eed4b9ab6fb44b636c9a3d
Parents: 9bdd0d5 5817cdb
Author: Kirk Lund <kl...@pivotal.io>
Authored: Thu May 5 13:50:07 2016 -0700
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Thu May 5 13:50:07 2016 -0700
----------------------------------------------------------------------
.../membership/gms/membership/GMSJoinLeave.java | 94 +-
.../gemfire/internal/cache/AbstractRegion.java | 2 +-
.../cache/tx/AbstractPeerTXRegionStub.java | 8 +-
.../internal/offheap/ReferenceCountHelper.java | 218 ++---
.../offheap/ReferenceCountHelperImpl.java | 304 ++++++
.../management/internal/cli/Launcher.java | 9 +-
.../internal/cli/commands/ShellCommands.java | 59 +-
.../management/internal/cli/shell/Gfsh.java | 41 +-
.../internal/cli/shell/GfshConfig.java | 11 +
.../internal/cli/shell/jline/GfshHistory.java | 12 +-
.../gemfire/cache30/Bug44418JUnitTest.java | 137 ++-
.../gemfire/cache30/ReconnectDUnitTest.java | 7 +-
.../cache/tx/AbstractPeerTXRegionStubTest.java | 164 ++++
.../offheap/ReferenceCountHelperImplTest.java | 974 +++++++++++++++++++
.../offheap/ReferenceCountHelperJUnitTest.java | 208 ++++
.../cli/shell/GfshHistoryJUnitTest.java | 13 +
.../pdx/DistributedSystemIdDUnitTest.java | 6 +-
geode-site/website/content/releases/index.html | 2 +-
18 files changed, 1928 insertions(+), 341 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b1482e69/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshHistoryJUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshHistoryJUnitTest.java
index 62f16d7,b2081d2..cfa9e32
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshHistoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/shell/GfshHistoryJUnitTest.java
@@@ -81,6 -81,20 +81,19 @@@ public class GfshHistoryJUnitTest
gfsh.executeScriptLine("connect --password=foo --password = foo --password= goo --password =goo --password-param=blah --other-password-param= gah");
List<String> lines = Files.readAllLines(gfshHistoryFile.toPath());
- assertEquals("// [failed] connect --password=***** --password = ***** --password= ***** --password =***** --password-param=***** --other-password-param= *****",
- lines.get(1));
+ assertEquals("// [failed] connect --password=***** --password = ***** --password= ***** --password =***** --password-param=***** --other-password-param= *****", lines.get(1));
}
+
+ @Test
+ public void testClearHistory() throws Exception{
+ Gfsh gfsh = Gfsh.getInstance(false, new String[] {}, gfshConfig);
+ gfsh.executeScriptLine("connect --fake-param=foo");
+ List<String> lines = Files.readAllLines(gfshHistoryFile.toPath());
+ assertEquals(2, lines.size());
+
+ // clear the history
+ gfsh.clearHistory();
+ assertEquals(gfsh.getGfshHistory().size(), 0);
+ assertFalse(gfshHistoryFile.exists());
+ }
}