svn commit: r1372302 - in /lucene/dev/trunk/lucene: core/src/test/org/apache/lucene/index/Test2BPostings.java test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java test-framework/src/java/org/apache/lucene/util/TimeUnits.java

[dw...@apache.org]

Author: dweiss
Date: Mon Aug 13 07:59:08 2012
New Revision: 1372302

URL: http://svn.apache.org/viewvc?rev=1372302&view=rev
Log:
LUCENE-4301: re-enable suite timeouts. default increased to 2 hours, test2bpostings increased to 4 hours.

Added:
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java
Modified:
    lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java

Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java?rev=1372302&r1=1372301&r2=1372302&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java Mon Aug 13 07:59:08 2012
@@ -28,14 +28,18 @@ import org.apache.lucene.index.FieldInfo
 import org.apache.lucene.store.BaseDirectoryWrapper;
 import org.apache.lucene.store.MockDirectoryWrapper;
 import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TimeUnits;
 import org.apache.lucene.util._TestUtil;
 import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
 
+import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
+
 /**
  * Test indexes ~82M docs with 26 terms each, so you get > Integer.MAX_VALUE terms/docs pairs
  * @lucene.experimental
  */
 @SuppressCodecs({ "SimpleText", "Memory", "Direct" })
+@TimeoutSuite(millis = 4 * TimeUnits.HOUR)
 public class Test2BPostings extends LuceneTestCase {
 
   @Nightly

Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1372302&r1=1372301&r2=1372302&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Mon Aug 13 07:59:08 2012
@@ -124,7 +124,7 @@ import static com.carrotsearch.randomize
 @ThreadLeakAction({Action.WARN, Action.INTERRUPT})
 @ThreadLeakLingering(linger = 20000) // Wait long for leaked threads to complete before failure. zk needs this.
 @ThreadLeakZombies(Consequence.IGNORE_REMAINING_TESTS)
-@TimeoutSuite(millis = Integer.MAX_VALUE) // NOT YET: until nightly tests etc are factored in.
+@TimeoutSuite(millis = 2 * TimeUnits.HOUR)
 @ThreadLeakFilters(defaultFilters = true, filters = {
     QuickPatchThreadsFilter.class
 })
@@ -211,7 +211,6 @@ public abstract class LuceneTestCase ext
   public @interface SuppressCodecs {
     String[] value();
   }
-
   
   // -----------------------------------------------------------------
   // Truly immutable fields and constants, initialized once and valid 

Added: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java?rev=1372302&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java (added)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java Mon Aug 13 07:59:08 2012
@@ -0,0 +1,30 @@
+package org.apache.lucene.util;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** time unit constants for use in annotations. */
+public final class TimeUnits {
+  private TimeUnits() {}
+
+  /** 1 second in milliseconds */
+  public static final int SECOND = 1000;
+  /** 1 minute in milliseconds */
+  public static final int MINUTE = 60 * SECOND;
+  /** 1 hour in milliseconds */
+  public static final int HOUR = 60 * MINUTE;  
+}