You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2013/11/12 14:56:59 UTC
svn commit: r1541065 - in
/karaf/trunk/itests/src/test/java/org/apache/karaf/itests:
KarafTestSupport.java features/StandardFeaturesTest.java
Author: cschneider
Date: Tue Nov 12 13:56:59 2013
New Revision: 1541065
URL: http://svn.apache.org/r1541065
Log:
KARAF-2566 Fix regression test
Modified:
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java?rev=1541065&r1=1541064&r2=1541065&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java Tue Nov 12 13:56:59 2013
@@ -362,11 +362,14 @@ public class KarafTestSupport {
protected void installAssertAndUninstallFeature(String... feature) throws Exception {
Set<Feature> featuresBefore = new HashSet<Feature>(Arrays.asList(featureService.listInstalledFeatures()));
- for (String curFeature : feature) {
- featureService.installFeature(curFeature);
- assertFeatureInstalled(curFeature);
- }
- uninstallNewFeatures(featuresBefore);
+ try {
+ for (String curFeature : feature) {
+ featureService.installFeature(curFeature);
+ assertFeatureInstalled(curFeature);
+ }
+ } finally {
+ uninstallNewFeatures(featuresBefore);
+ }
}
/**
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java?rev=1541065&r1=1541064&r2=1541065&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java Tue Nov 12 13:56:59 2013
@@ -31,7 +31,7 @@ public class StandardFeaturesTest extend
*/
public void checkInteractionOfHttpAndAriesAnnotationFeature() throws Exception {
installAssertAndUninstallFeature("aries-annotation", "pax-http");
- installAssertAndUninstallFeature("aries-annotation", "pax-http");
+ installAssertAndUninstallFeature("pax-http", "aries-annotation");
}
@Test