You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2015/12/12 01:52:28 UTC

phoenix git commit: PHOENIX-2332 Fix flapping MutableIndexFailureIT.testWriteFailureDisablesIndex()

Repository: phoenix
Updated Branches:
  refs/heads/master 9fbc8c4ff -> 466e3493e


PHOENIX-2332 Fix flapping MutableIndexFailureIT.testWriteFailureDisablesIndex()


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

Branch: refs/heads/master
Commit: 466e3493ef4984dffa6c9f05fdefc260e56093c7
Parents: 9fbc8c4
Author: Thomas D'Silva <td...@salesforce.com>
Authored: Fri Dec 11 16:44:07 2015 -0800
Committer: Thomas D'Silva <td...@salesforce.com>
Committed: Fri Dec 11 16:44:07 2015 -0800

----------------------------------------------------------------------
 .../apache/phoenix/end2end/index/MutableIndexFailureIT.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/466e3493/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index 979fd31..eac15b9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -61,7 +61,6 @@ import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.StringUtil;
 import org.apache.phoenix.util.TestUtil;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -118,14 +117,12 @@ public class MutableIndexFailureIT extends BaseOwnClusterHBaseManagedTimeIT {
         return Arrays.asList(new Boolean[][] { { false }, { true } });
     }
 
-    @Ignore("See PHOENIX-2331")
-    @Test(timeout=300000)
+    @Test
     public void testWriteFailureDisablesLocalIndex() throws Exception {
         helpTestWriteFailureDisablesIndex(true);
     }
  
-    @Ignore("See PHOENIX-2332")
-    @Test(timeout=300000)
+    @Test
     public void testWriteFailureDisablesIndex() throws Exception {
         helpTestWriteFailureDisablesIndex(false);
     }
@@ -299,7 +296,7 @@ public class MutableIndexFailureIT extends BaseOwnClusterHBaseManagedTimeIT {
             }
         }
         
-        @Test(timeout=300000)
+        @Test
         public void testWriteFailureWithRegionServerDown() throws Exception {
             String query;
             ResultSet rs;