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

64840: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64783: MNT-10059: Resurrect PublishingRestApiTest and PublishWebContentJbpmTest.
      Re-enable PublishingRestApiTest test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-04-02 20:07:52 +00:00
parent 663a50d6f9
commit 85a044dab3

View File

@@ -90,8 +90,7 @@ public class WebScriptTestSuite extends TestSuite
suite.addTestSuite( WorkflowModelBuilderTest.class );
suite.addTestSuite( ActivitiWorkflowRestApiTest.class );
suite.addTestSuite( JBPMWorkflowRestApiTest.class );
// Still failing - see MNT-10059
// suite.addTestSuite( PublishingRestApiTest.class );
suite.addTestSuite( PublishingRestApiTest.class );
// This uses a slightly different context
// As such, we can't run it in the same suite as the others,