LUCENE-4301: re-enable suite timeouts. default increased to 2 hours, …

…test2bpostings increased to 4 hours.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1372310 13f79535-47bb-0310-9956-ffa450edef68

lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java

@@ -28,14 +28,18 @@
 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

lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java

@@ -125,7 +125,7 @@
 @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 = 10 * (/* minutes */ 1000 * 60)) // max suite execution time.
+@TimeoutSuite(millis = 2 * TimeUnits.HOUR)
 @ThreadLeakFilters(defaultFilters = true, filters = {
     QuickPatchThreadsFilter.class
 })
@@ -212,7 +212,6 @@ public abstract class LuceneTestCase extends Assert {
   public @interface SuppressCodecs {
     String[] value();
   }
-
 
   // -----------------------------------------------------------------
   // Truly immutable fields and constants, initialized once and valid 

lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java

@@ -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;  
+}