You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2015/07/08 15:22:34 UTC
svn commit: r1689868 - in
/sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup:
AsyncInstaller.java IncrementalStartupIT.java P.java
Author: bdelacretaz
Date: Wed Jul 8 13:22:34 2015
New Revision: 1689868
URL: http://svn.apache.org/r1689868
Log:
SLING-4851 - fix activator reporting bug
Modified:
sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/AsyncInstaller.java
sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/IncrementalStartupIT.java
sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/P.java
Modified: sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/AsyncInstaller.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/AsyncInstaller.java?rev=1689868&r1=1689867&r2=1689868&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/AsyncInstaller.java (original)
+++ sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/AsyncInstaller.java Wed Jul 8 13:22:34 2015
@@ -159,7 +159,7 @@ class AsyncInstaller implements Framewor
/** Check that the test bundle activators finished at the right start level */
Collection<String> getActivatorIssues(Map<String, Integer> levels) {
- final Set<String> issues = new HashSet<String>(installedBundles);
+ final Set<String> issues = new HashSet<String>();
assertTrue("Expecting some activator reports", levels.size() > 0);
for(String bsn : levels.keySet()) {
final int expected = startLevelFromBsn(bsn);
Modified: sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/IncrementalStartupIT.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/IncrementalStartupIT.java?rev=1689868&r1=1689867&r2=1689868&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/IncrementalStartupIT.java (original)
+++ sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/IncrementalStartupIT.java Wed Jul 8 13:22:34 2015
@@ -62,7 +62,7 @@ public class IncrementalStartupIT {
private void setStartLevel(final int to) {
log.info("Changing start level to {}", to);
startLevel.setStartLevel(to);
- WaitFor.randomWait(200);
+ WaitFor.randomWait(P.MAX_WAIT_BETWEEN_LEVELS);
new WaitFor(DEFAULT_TIMEOUT) {
protected boolean condition() {
@@ -112,7 +112,7 @@ public class IncrementalStartupIT {
if(issues.isEmpty()) {
return true;
}
- setInfo("Bundle issues: " + issues.toString());
+ setInfo("Bundle issues: (" + issues.size() + "): " + issues.toString());
return false;
}
};
@@ -125,7 +125,7 @@ public class IncrementalStartupIT {
if(issues.isEmpty()) {
return true;
}
- setInfo("Activator issues: " + issues.toString());
+ setInfo("Activator issues: (" + issues.size() + "): " + issues.toString());
return false;
}
};
Modified: sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/P.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/P.java?rev=1689868&r1=1689867&r2=1689868&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/P.java (original)
+++ sling/whiteboard/bdelacretaz/it-startup/src/test/java/org/apache/sling/launchpad/it/startup/P.java Wed Jul 8 13:22:34 2015
@@ -33,6 +33,7 @@ public class P {
public static final int START_LEVEL_CHANGE = 5;
public static final int MAX_BUNDLES_PER_LEVEL = 3;
+ public static final int MAX_WAIT_BETWEEN_LEVELS = 200;
public static Option[] paxConfig() {
final File thisProjectsBundle = new File(System.getProperty( "bundle.file.name", "BUNDLE_FILE_NOT_SET" ));