You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/02/26 19:45:03 UTC
[1/3] git commit: Fix test for change in CASSANDRA-6357
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 f145fa496 -> 583041f54
refs/heads/trunk 78e7a5d1d -> 8809d8ada
Fix test for change in CASSANDRA-6357
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/583041f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/583041f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/583041f5
Branch: refs/heads/cassandra-2.1
Commit: 583041f541e5622ffe8aa569b6c6e4b693649a14
Parents: f145fa4
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Feb 26 12:44:29 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Feb 26 12:44:29 2014 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/db/DirectoriesTest.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/583041f5/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/DirectoriesTest.java b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 8130cf4..97cd21c 100644
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@ -22,6 +22,10 @@ import java.io.IOException;
import java.util.*;
import java.util.concurrent.*;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -178,12 +182,13 @@ public class DirectoriesTest
public void testDiskFailurePolicy_best_effort()
{
DiskFailurePolicy origPolicy = DatabaseDescriptor.getDiskFailurePolicy();
-
- try
+
+ List<DataDirectory> directories = Lists.asList(Directories.flushDirectory, Directories.dataDirectories);
+ try
{
DatabaseDescriptor.setDiskFailurePolicy(DiskFailurePolicy.best_effort);
-
- for (DataDirectory dd : Directories.dataDirectories)
+
+ for (DataDirectory dd : directories)
{
dd.location.setExecutable(false);
dd.location.setWritable(false);
@@ -199,7 +204,7 @@ public class DirectoriesTest
}
finally
{
- for (DataDirectory dd : Directories.dataDirectories)
+ for (DataDirectory dd : directories)
{
dd.location.setExecutable(true);
dd.location.setWritable(true);
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8809d8ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8809d8ad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8809d8ad
Branch: refs/heads/trunk
Commit: 8809d8adaebe1d2f1065dcce93fcbba3627fb0f4
Parents: 78e7a5d 583041f
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Feb 26 12:44:51 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Feb 26 12:44:51 2014 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/db/DirectoriesTest.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Fix test for change in CASSANDRA-6357
Posted by yu...@apache.org.
Fix test for change in CASSANDRA-6357
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/583041f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/583041f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/583041f5
Branch: refs/heads/trunk
Commit: 583041f541e5622ffe8aa569b6c6e4b693649a14
Parents: f145fa4
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Feb 26 12:44:29 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Feb 26 12:44:29 2014 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/db/DirectoriesTest.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/583041f5/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/DirectoriesTest.java b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 8130cf4..97cd21c 100644
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@ -22,6 +22,10 @@ import java.io.IOException;
import java.util.*;
import java.util.concurrent.*;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -178,12 +182,13 @@ public class DirectoriesTest
public void testDiskFailurePolicy_best_effort()
{
DiskFailurePolicy origPolicy = DatabaseDescriptor.getDiskFailurePolicy();
-
- try
+
+ List<DataDirectory> directories = Lists.asList(Directories.flushDirectory, Directories.dataDirectories);
+ try
{
DatabaseDescriptor.setDiskFailurePolicy(DiskFailurePolicy.best_effort);
-
- for (DataDirectory dd : Directories.dataDirectories)
+
+ for (DataDirectory dd : directories)
{
dd.location.setExecutable(false);
dd.location.setWritable(false);
@@ -199,7 +204,7 @@ public class DirectoriesTest
}
finally
{
- for (DataDirectory dd : Directories.dataDirectories)
+ for (DataDirectory dd : directories)
{
dd.location.setExecutable(true);
dd.location.setWritable(true);