svn commit: r1501673 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java

[rombert]

Author: rombert
Date: Wed Jul 10 08:42:02 2013
New Revision: 1501673

URL: http://svn.apache.org/r1501673
Log:
SLING-2959 - ErrorHandlingTest intermitent failures in setUp

Be more conservative about the paths which are deleted in tearDown(),
especially avoiding deleting the whole /apps node.

Modified:
    
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java

Modified: 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java?rev=1501673&r1=1501672&r2=1501673&view=diff
==============================================================================
--- 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
 (original)
+++ 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
 Wed Jul 10 08:42:02 2013
@@ -65,13 +65,15 @@ public class ErrorHandlingTest extends J
  
                final Map<String, String> props = new HashMap<String, String>();
                props.put(SLING_RESOURCE_TYPE, TEST_ROOT+"/"+THROW_ERROR_PATH);
-               testNodePath = testClient.createNode(HTTP_BASE_URL + TEST_ROOT, 
props);
+        testNodePath = testClient.createNode(HTTP_BASE_URL + TEST_ROOT + 
"/testNode", props);
        }
 
        @Override
        protected void tearDown() throws Exception {
-               super.tearDown();
-               testClient.delete(HTTP_BASE_URL + TEST_ROOT);
+        testClient.delete(HTTP_BASE_URL + ERROR_HANDLER_PATH);
+        testClient.delete(HTTP_BASE_URL + TEST_ROOT + "/" + THROW_ERROR_PATH);
+        testClient.delete(testNodePath);
+        super.tearDown();
        }