bookkeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhai...@apache.org
Subject [bookkeeper] branch master updated: ISSUE #532: Drop all @Test(timeout) annotations
Date Wed, 04 Oct 2017 02:46:27 GMT
This is an automated email from the ASF dual-hosted git repository.

zhaijia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 029fc60  ISSUE #532: Drop all @Test(timeout) annotations
029fc60 is described below

commit 029fc609cd4933b55af4d40af69ef59dad83a842
Author: Enrico Olivelli <eolivelli@apache.org>
AuthorDate: Wed Oct 4 10:46:18 2017 +0800

    ISSUE #532: Drop all @Test(timeout) annotations
    
    Simply drop the 'timeout' parameter for Test annotations, we have already a global timeout
set in surefire configuration
    
    Author: Enrico Olivelli <eolivelli@apache.org>
    
    Reviewers: Jia Zhai <None>, Sijie Guo <sijie@apache.org>
    
    This closes #533 from eolivelli/task/cleaup-timeouts, closes #532
---
 .../org/apache/bookkeeper/bookie/IndexPersistenceMgrTest.java     | 8 ++++----
 .../java/org/apache/bookkeeper/versioning/TestLongVersion.java    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/IndexPersistenceMgrTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/IndexPersistenceMgrTest.java
index 19862a5..1c63d39 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/IndexPersistenceMgrTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/IndexPersistenceMgrTest.java
@@ -134,7 +134,7 @@ public class IndexPersistenceMgrTest {
     final long lid = 1L;
     final byte[] masterKey = "write".getBytes();
 
-    @Test(timeout = 60000)
+    @Test
     public void testGetFileInfoReadBeforeWrite() throws Exception {
         IndexPersistenceMgr indexPersistenceMgr = null;
         try {
@@ -162,7 +162,7 @@ public class IndexPersistenceMgrTest {
         }
     }
 
-    @Test(timeout = 60000)
+    @Test
     public void testGetFileInfoWriteBeforeRead() throws Exception {
         IndexPersistenceMgr indexPersistenceMgr = null;
         try {
@@ -188,7 +188,7 @@ public class IndexPersistenceMgrTest {
         }
     }
 
-    @Test(timeout = 60000)
+    @Test
     public void testReadFileInfoCacheEviction() throws Exception {
         IndexPersistenceMgr indexPersistenceMgr = null;
         try {
@@ -232,7 +232,7 @@ public class IndexPersistenceMgrTest {
         }
     }
 
-    @Test(timeout = 60000)
+    @Test
     public void testEvictionShouldNotAffectLongPollRead() throws Exception {
         IndexPersistenceMgr indexPersistenceMgr = null;
         Observer observer = (obs, obj) -> {
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/versioning/TestLongVersion.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/versioning/TestLongVersion.java
index 51f98e6..eef44b0 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/versioning/TestLongVersion.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/versioning/TestLongVersion.java
@@ -23,7 +23,7 @@ import org.junit.Assert;
 
 public class TestLongVersion {
 
-    @Test(timeout=60000)
+    @Test
     public void testNullIntVersion() {
         LongVersion longVersion = new LongVersion(99);
         try {
@@ -33,7 +33,7 @@ public class TestLongVersion {
         }
     }
 
-    @Test(timeout=60000)
+    @Test
     public void testInvalidVersion() {
         LongVersion longVersion = new LongVersion(99);
         try {
@@ -43,7 +43,7 @@ public class TestLongVersion {
         }
     }
 
-    @Test(timeout=60000)
+    @Test
     public void testCompare() {
         LongVersion iv = new LongVersion(99);
         Assert.assertEquals(Occurred.AFTER, iv.compare(new LongVersion(98)));

-- 
To stop receiving notification emails like this one, please contact
['"commits@bookkeeper.apache.org" <commits@bookkeeper.apache.org>'].

Mime
View raw message