activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1455928 - in /activemq/activemq-apollo/trunk: ./ apollo-stomp/src/test/resources/ apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/ apollo-util/src/test/scala/org/apache/activemq/apollo/util/
Date Wed, 13 Mar 2013 13:27:10 GMT
Author: chirino
Date: Wed Mar 13 13:27:10 2013
New Revision: 1455928

URL: http://svn.apache.org/r1455928
Log:
Only execute on junit test at a time for now to make the tests easier to debug.

Modified:
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompSecurityTest.scala
    activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties?rev=1455928&r1=1455927&r2=1455928&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties Wed Mar
13 13:27:10 2013
@@ -20,6 +20,7 @@
 #
 log4j.rootLogger=WARN, console, logfile
 log4j.logger.org.apache.activemq.apollo=INFO
+log4j.logger.org.apache.activemq.apollo.log.connection=WARN
 
 #
 # Uncomment one of the following to enable debug logging

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompSecurityTest.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompSecurityTest.scala?rev=1455928&r1=1455927&r2=1455928&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompSecurityTest.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompSecurityTest.scala
Wed Mar 13 13:27:10 2013
@@ -29,7 +29,6 @@ class StompSecurityTest extends StompTes
 
   override def beforeAll = {
     try {
-      println("before: " + testName)
       val login_file = new java.io.File(getClass.getClassLoader.getResource("login.config").getFile())
       System.setProperty("java.security.auth.login.config", login_file.getCanonicalPath)
     } catch {

Modified: activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala?rev=1455928&r1=1455927&r2=1455928&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala
Wed Mar 13 13:27:10 2013
@@ -104,21 +104,27 @@ abstract class FunSuiteSupport extends F
   def is_parallel_test_class = true
 
   override protected def beforeAll(map: Map[String, Any]): Unit = {
-    if ( is_parallel_test_class ) {
-      parallel_test_class_lock.readLock().lock()
-    } else {
-      parallel_test_class_lock.writeLock().lock()
-    }
+    val original_name = Thread.currentThread().getName
+    try {
+      Thread.currentThread().setName(getClass.getName)
+      if ( is_parallel_test_class ) {
+        parallel_test_class_lock.readLock().lock()
+      } else {
+        parallel_test_class_lock.writeLock().lock()
+      }
 
-    _basedir = map.get("basedir") match {
-      case Some(basedir) =>
-        basedir.toString
-      case _ =>
-        System.getProperty("basedir", _basedir)
-    }
-    System.setProperty("basedir", _basedir)
-    test_data_dir.recursive_delete
-    super.beforeAll(map)
+      _basedir = map.get("basedir") match {
+        case Some(basedir) =>
+          basedir.toString
+        case _ =>
+          System.getProperty("basedir", _basedir)
+      }
+      System.setProperty("basedir", _basedir)
+      test_data_dir.recursive_delete
+      super.beforeAll(map)
+    } finally {
+      Thread.currentThread().setName(original_name)
+    }
   }
 
   override protected def afterAll(configMap: Map[String, Any]) {

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1455928&r1=1455927&r2=1455928&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Wed Mar 13 13:27:10 2013
@@ -317,7 +317,7 @@
             </excludes>
             <parallel>classes</parallel>
             <perCoreThreadCount>false</perCoreThreadCount>
-            <threadCount>2</threadCount> 
+            <threadCount>1</threadCount> 
           </configuration>
         </plugin>
         



Mime
View raw message