Author: justin
Date: Wed Aug 18 17:37:33 2010
New Revision: 986813
URL: http://svn.apache.org/viewvc?rev=986813&view=rev
Log:
SLING-1650 - fixing broken integration test; fixing log support for non-INFO
levels
Modified:
sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java
Modified:
sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java?rev=986813&r1=986812&r2=986813&view=diff
==============================================================================
---
sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java
(original)
+++
sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java
Wed Aug 18 17:37:33 2010
@@ -226,12 +226,16 @@ class OsgiInstallerTestBase implements F
}
Configuration result = null;
- final long end = System.currentTimeMillis() + timeoutMsec;
+ final long start = System.currentTimeMillis();
+ final long end = start + timeoutMsec;
+ log(LogService.LOG_DEBUG, "Starting config check at " + start + ";
ending by " + end);
do {
result = findConfiguration(pid);
- if (result != null ||!shouldBePresent) {
+ if ((shouldBePresent && result != null) ||
+ (!shouldBePresent && result == null)) {
break;
}
+ log(LogService.LOG_DEBUG, "Config check failed at " +
System.currentTimeMillis() + "; sleeping");
sleep(25);
} while(System.currentTimeMillis() < end);
@@ -340,7 +344,7 @@ class OsgiInstallerTestBase implements F
protected void log(int level, String msg) {
final LogService log = getService(LogService.class);
- log.log(LogService.LOG_INFO, msg);
+ log.log(level, msg);
}
public static Option[] defaultConfiguration() {
