sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1163521 - in /sling/trunk/installer: core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java it/src/test/java/org/apache/sling/installer/it/BundleStatePreservedTest.java
Date Wed, 31 Aug 2011 08:21:57 GMT
Author: cziegeler
Date: Wed Aug 31 08:21:57 2011
New Revision: 1163521

URL: http://svn.apache.org/viewvc?rev=1163521&view=rev
Log:
Remove special wait cycle for integration tests

Modified:
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
    sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleStatePreservedTest.java

Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?rev=1163521&r1=1163520&r2=1163521&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
(original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Wed Aug 31 08:21:57 2011
@@ -202,11 +202,6 @@ public class OsgiInstallerImpl
                     }
                 }
             }
-            // Some integration tests depend on this delay, make sure to
-            // rerun/adapt them if changing this value
-            try {
-                Thread.sleep(250);
-            } catch (final InterruptedException ignore) {}
         }
     }
 

Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleStatePreservedTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleStatePreservedTest.java?rev=1163521&r1=1163520&r2=1163521&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleStatePreservedTest.java
(original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleStatePreservedTest.java
Wed Aug 31 08:21:57 2011
@@ -74,10 +74,13 @@ public class BundleStatePreservedTest ex
     	// Execute some OsgiController operations
         Object listener = this.startObservingBundleEvents();
         installer.updateResources(URL_SCHEME, getInstallableResource(getTestBundle(BUNDLE_BASE_NAME
+ "-testbundle-1.0.jar")), null);
+        sleep(150);
         installer.updateResources(URL_SCHEME, getInstallableResource(getTestBundle(BUNDLE_BASE_NAME
+ "-testbundle-1.2.jar")), null);
+        sleep(150);
         installer.updateResources(URL_SCHEME, getInstallableResource(getTestBundle(BUNDLE_BASE_NAME
+ "-testbundle-1.1.jar")), null);
         this.waitForBundleEvents("Bundle must be installed", listener,
-                new BundleEvent("osgi-installer-testbundle", "1.2", org.osgi.framework.BundleEvent.INSTALLED),
+                new BundleEvent("osgi-installer-testbundle", "1.0", org.osgi.framework.BundleEvent.INSTALLED),
+                new BundleEvent("osgi-installer-testbundle", "1.2", org.osgi.framework.BundleEvent.UPDATED),
                 new BundleEvent("osgi-installer-testbundle", "1.2", org.osgi.framework.BundleEvent.STARTED));
         assertBundle("After installing testbundle", "osgi-installer-testbundle", "1.2", Bundle.ACTIVE);
 



Mime
View raw message