inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
69761: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69649: Merged DEV to V4.2-BUG-FIX
         69604: MNT-11378: Intermittent test failures: ProcessWorkflowApiTest and TaskWorkflowApiTest
          - Add logging to find out cause of failing on bamboo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70442 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-05-16 17:43:48 +00:00
parent 962295dc5a
commit c89bee1ff4
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/test-java/org/alfresco/rest/api/tests/AbstractTestApi.java
View File

@@ -76,10 +76,15 @@ public abstract class AbstractTestApi
protected void log(String msg) protected void log(String msg)
{ {
if(logger.isDebugEnabled()) log(msg, null);
{ }
logger.debug(msg);
} protected void log(String msg, Throwable t)
{
if(logger.isDebugEnabled())
{
logger.debug(msg, t);
}
} }
protected Paging getPaging(Integer skipCount, Integer maxItems) protected Paging getPaging(Integer skipCount, Integer maxItems)

6
source/test-java/org/alfresco/rest/workflow/api/tests/ProcessWorkflowApiTest.java
View File

@@ -2154,13 +2154,17 @@ public class ProcessWorkflowApiTest extends EnterpriseWorkflowTestApi
{ {
activitiProcessEngine.getRuntimeService().deleteProcessInstance(processInstanceId, null); activitiProcessEngine.getRuntimeService().deleteProcessInstance(processInstanceId, null);
} }
catch(Exception e) {} catch(Exception e)
{
log("Error while cleaning up process instance", e);
}
activitiProcessEngine.getHistoryService().deleteHistoricProcessInstance(processInstanceId); activitiProcessEngine.getHistoryService().deleteHistoricProcessInstance(processInstanceId);
} }
} }
catch (Throwable t) catch (Throwable t)
{ {
// Ignore error during cleanup // Ignore error during cleanup
log("Error while cleaning up process instance", t);
} }
} }
} }

4
source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java
View File

@@ -3880,7 +3880,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
catch(Throwable t) catch(Throwable t)
{ {
// Ignore error during cleanup to prevent swallowing potential assetion-exception // Ignore error during cleanup to prevent swallowing potential assetion-exception
log("Error while cleaning up process instance"); log("Error while cleaning up process instance", t);
} }
} }
@@ -3898,7 +3898,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
catch(Throwable t) catch(Throwable t)
{ {
// Ignore error during cleanup to prevent swallowing potential assetion-exception // Ignore error during cleanup to prevent swallowing potential assetion-exception
log("Error while cleaning up process instance"); log("Error while cleaning up process instance", t);
} }
} }
} }

2
source/test-resources/log4j.properties
View File

@@ -5,5 +5,5 @@ log4j.appender.Console.layout=org.apache.log4j.PatternLayout
log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n
log4j.logger.org.alfresco=WARN log4j.logger.org.alfresco=WARN
#log4j.logger.org.alfresco.rest.api=DEBUG log4j.logger.org.alfresco.rest.api=DEBUG
log4j.logger.org.eclipse.jetty.util.log=INFO log4j.logger.org.eclipse.jetty.util.log=INFO