Merge pull request #619 from zanata/more-test-logging

Enable more logging in functional tests
zanata · Oct 24, 2014 · 0a452a5 · 0a452a5
2 parents 5f9b072 + a17d78f
commit 0a452a5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/functional-test/pom.xml b/functional-test/pom.xml
@@ -162,9 +162,13 @@
 
     <dependency>
       <groupId>org.subethamail</groupId>
-      <artifactId>subethasmtp-wiser</artifactId>
-      <version>1.2</version>
+      <artifactId>subethasmtp</artifactId>
+      <version>3.1.7</version>
       <exclusions>
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>jsr305</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>

diff --git a/functional-test/src/test/java/org/zanata/util/RetryRule.java b/functional-test/src/test/java/org/zanata/util/RetryRule.java
@@ -70,8 +70,8 @@ public void evaluate() throws Throwable {
                         return;
                     } catch (Throwable t) {
                         throwable = t;
-                        log.info(description.getDisplayName() + ": Execution "
-                                + (currentTry()) + " failed");
+                        log.warn(description.getDisplayName() + ": Execution "
+                                + (currentTry()) + " failed", t);
                     }
                 }
                 log.info(description.getDisplayName() +

diff --git a/pom.xml b/pom.xml
@@ -736,6 +736,19 @@
         <scope>provided</scope>
       </dependency>
 
+      <dependency>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
+        <version>1.1.1</version>
+        <scope>provided</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
       <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>

diff --git a/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java b/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
@@ -41,7 +41,9 @@
 import org.zanata.model.HTextFlowTarget;
 import org.zanata.model.HTextFlowTargetHistory;
 import org.zanata.model.HTextFlowTargetReviewComment;
+import org.zanata.model.po.HPoHeader;
 import org.zanata.model.po.HPoTargetHeader;
+import org.zanata.model.po.HPotEntryData;
 import org.zanata.model.security.HCredentials;
 import org.zanata.model.tm.TransMemory;
 import org.zanata.model.tm.TransMemoryUnit;
@@ -79,9 +81,11 @@ public static List<Class> entitiesForRemoval() {
                 HTextFlowTargetReviewComment.class,
                 HTextFlowTarget.class,
                 HTextFlowHistory.class,
+                HPotEntryData.class,
                 HTextFlow.class);
         // documents
         builder.add(HDocumentHistory.class, HDocument.class);
+        builder.add(HPoHeader.class);
         // locales
         builder.add(HLocaleMember.class, HLocale.class);
         builder.add(HIterationGroup.class);