directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r894822 - /directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
Date Thu, 31 Dec 2009 11:24:19 GMT
Author: kayyagari
Date: Thu Dec 31 11:24:18 2009
New Revision: 894822

URL: http://svn.apache.org/viewvc?rev=894822&view=rev
Log:
added a flag to support reverting method level data while running tests with LdapServer also

Modified:
    directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java

Modified: directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java?rev=894822&r1=894821&r2=894822&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
(original)
+++ directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
Thu Dec 31 11:24:18 2009
@@ -364,14 +364,17 @@
             // Run the test
             super.runChild( method, notifier );
 
+            boolean stopped = false;
             // Cleanup the methodDS if it has been created
             if ( methodDS != null )
             {
                 LOG.debug( "Shuting down DS for {}", methodDS.getInstanceId() );
                 methodDS.shutdown();
                 FileUtils.deleteDirectory( methodDS.getWorkingDirectory() );
+                stopped = true;
             }
-            else if ( revision < directoryService.getChangeLog().getCurrentRevision()
)
+            
+            if ( ( !stopped ) && ( revision < directoryService.getChangeLog().getCurrentRevision()
) )
             {
                 // We use a class or suite DS, just revert the current test's modifications
                 directoryService.revert( revision );



Mime
View raw message