You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2013/03/07 02:09:53 UTC

svn commit: r1453637 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/util/TestWinUtils.java

Author: suresh
Date: Thu Mar  7 01:09:53 2013
New Revision: 1453637

URL: http://svn.apache.org/r1453637
Log:
HADOOP-9372. Fix bad timeout annotations on tests. Contributed by Arpit Agarwal.

Modified:
    hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestWinUtils.java

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1453637&r1=1453636&r2=1453637&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Mar  7 01:09:53 2013
@@ -453,6 +453,9 @@ Trunk (Unreleased)
     HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt.
     (suresh)
 
+    HADOOP-9372. Fix bad timeout annotations on tests.
+    (Arpit Agarwal via suresh)
+
 Release 2.0.4-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestWinUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestWinUtils.java?rev=1453637&r1=1453636&r2=1453637&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestWinUtils.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestWinUtils.java Thu Mar  7 01:09:53 2013
@@ -152,7 +152,6 @@ public class TestWinUtils {
     assertEquals(expected, output);
   }
 
-  @Test (timeout = 30000)
   private void testChmodInternal(String mode, String expectedPerm)
       throws IOException {
     File a = new File(TEST_DIR, "file1");
@@ -171,7 +170,6 @@ public class TestWinUtils {
     assertFalse(a.exists());
   }
 
-  @Test (timeout = 30000)
   private void testNewFileChmodInternal(String expectedPerm) throws IOException {
     // Create a new directory
     File dir = new File(TEST_DIR, "dir1");
@@ -193,7 +191,6 @@ public class TestWinUtils {
     assertFalse(dir.exists());
   }
 
-  @Test (timeout = 30000)
   private void testChmodInternalR(String mode, String expectedPerm,
       String expectedPermx) throws IOException {
     // Setup test folder hierarchy