accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Sun, 10 Aug 2014 19:27:52 GMT
Merge branch '1.6.1-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a63ded99
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a63ded99
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a63ded99

Branch: refs/heads/master
Commit: a63ded99d4903d6eb21403f218cc4ded1febf325
Parents: 19de968 07bacc3
Author: Josh Elser <elserj@apache.org>
Authored: Sun Aug 10 15:25:46 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Sun Aug 10 15:25:46 2014 -0400

----------------------------------------------------------------------
 .../accumulo/gc/SimpleGarbageCollectorTest.java     | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a63ded99/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
----------------------------------------------------------------------
diff --cc server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
index b18f90f,d4319b8..b776054
--- a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
@@@ -68,10 -73,8 +73,9 @@@ public class SimpleGarbageCollectorTes
    private AccumuloConfiguration mockSystemConfig() {
      AccumuloConfiguration systemConfig = createMock(AccumuloConfiguration.class);
      expect(systemConfig.getTimeInMillis(Property.GC_CYCLE_START)).andReturn(1000L);
 +    expect(systemConfig.getTimeInMillis(Property.GC_CYCLE_START)).andReturn(1000L);
      expect(systemConfig.getTimeInMillis(Property.GC_CYCLE_DELAY)).andReturn(20000L);
-     expect(systemConfig.getCount(Property.GC_DELETE_THREADS)).andReturn(2);
-     expect(systemConfig.getCount(Property.GC_DELETE_THREADS)).andReturn(2);
+     expect(systemConfig.getCount(Property.GC_DELETE_THREADS)).andReturn(2).times(2);
      expect(systemConfig.getBoolean(Property.GC_TRASH_IGNORE)).andReturn(false);
      replay(systemConfig);
      return systemConfig;


Mime
View raw message