avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r1056418 - in /avro/trunk: CHANGES.txt lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestTraceCollection.java lang/java/pom.xml
Date Fri, 07 Jan 2011 17:52:02 GMT
Author: cutting
Date: Fri Jan  7 17:52:02 2011
New Revision: 1056418

URL: http://svn.apache.org/viewvc?rev=1056418&view=rev
Log:
AVRO-643. Java: Fix intermittent failures in TestTraceCollection.

Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestTraceCollection.java
    avro/trunk/lang/java/pom.xml

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1056418&r1=1056417&r2=1056418&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Fri Jan  7 17:52:02 2011
@@ -113,6 +113,8 @@ Avro 1.5.0 (unreleased)
     AVRO-713. Java: Fix GenericData.Record#toString() to produce valid
     JSON for enum symbols. (Jay Kreps via cutting)    
 
+    AVRO-643. Java: Fix intermittent failures in TestTraceCollection. (cutting)
+
 Avro 1.4.1 (13 October 2010)
 
   NEW FEATURES

Modified: avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestTraceCollection.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestTraceCollection.java?rev=1056418&r1=1056417&r2=1056418&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestTraceCollection.java
(original)
+++ avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/trace/TestTraceCollection.java
Fri Jan  7 17:52:02 2011
@@ -84,6 +84,18 @@ public class TestTraceCollection {
       r.request("w", params);  
     }
     
+    server1.close();
+    server2.close();
+    server3.close();
+    aPlugin.httpServer.close();
+    aPlugin.clientFacingServer.stop();
+    bPlugin.httpServer.close();
+    bPlugin.clientFacingServer.stop();
+    cPlugin.httpServer.close();
+    cPlugin.clientFacingServer.stop();
+    dPlugin.httpServer.close();
+    dPlugin.clientFacingServer.stop();
+
     List<Span> allSpans = new ArrayList<Span>();
     allSpans.addAll(aPlugin.storage.getAllSpans());
     allSpans.addAll(bPlugin.storage.getAllSpans()); 
@@ -101,16 +113,5 @@ public class TestTraceCollection {
     for (Trace t: traces) {
       collection.addTrace(t);
     }
-    server1.close();
-    server2.close();
-    server3.close();
-    aPlugin.httpServer.close();
-    aPlugin.clientFacingServer.stop();
-    bPlugin.httpServer.close();
-    bPlugin.clientFacingServer.stop();
-    cPlugin.httpServer.close();
-    cPlugin.clientFacingServer.stop();
-    dPlugin.httpServer.close();
-    dPlugin.clientFacingServer.stop();
   }
 }

Modified: avro/trunk/lang/java/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/pom.xml?rev=1056418&r1=1056417&r2=1056418&view=diff
==============================================================================
--- avro/trunk/lang/java/pom.xml (original)
+++ avro/trunk/lang/java/pom.xml Fri Jan  7 17:52:02 2011
@@ -74,7 +74,6 @@
               <!-- exclude the generated classes under apache.avro.test, some of 
                 these match **/Test** and are not JUnit tests -->
               <exclude>**/apache/avro/test/**</exclude>
-              <exclude>**/apache/avro/ipc/trace/**</exclude>
             </excludes>
             <enableAssertions>false</enableAssertions>
             <!-- some IPC tests hang if not run in a separate JVM -->



Mime
View raw message