You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/12/03 19:57:55 UTC
svn commit: r1209978 - in
/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests:
CellarSampleDosgiGreeterTest.java CellarTestSupport.java
Author: iocanel
Date: Sat Dec 3 18:57:55 2011
New Revision: 1209978
URL: http://svn.apache.org/viewvc?rev=1209978&view=rev
Log:
[KARAF-1026] Fixed the dosgi itest to test 1 and 2 service nodes and also assert loadbalancing is correct.
Modified:
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java?rev=1209978&r1=1209977&r2=1209978&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java Sat Dec 3 18:57:55 2011
@@ -84,17 +84,14 @@ public class CellarSampleDosgiGreeterTes
assertEquals("Expected 10 greets", 10, countGreetsFromNode(greetOutput, node1));
System.err.println(executeCommand("cluster:group-set service-grp "+node2));
Thread.sleep(10000);
- //TODO: We shouldn't need this one. Sync should occur upon joining the group.
- System.err.println(executeCommand("cluster:features-install service-grp greeter-service"));
Thread.sleep(10000);
System.err.println(executeCommand("cluster:group-list"));
System.err.println(executeCommand("admin:connect child2 osgi:list -t 0"));
System.err.println(executeCommand("cluster:list-services"));
greetOutput = executeCommand("dosgi-greeter:greet Hi 10");
System.err.println(greetOutput);
- //TODO: Assertion fails here. Another bug needs fixing.
- //assertEquals("Expected 5 greets",5, countGreetsFromNode(greetOutput, node1));
- //assertEquals("Expected 5 greets",5, countGreetsFromNode(greetOutput, node2));
+ assertEquals("Expected 5 greets",5, countGreetsFromNode(greetOutput, node1));
+ assertEquals("Expected 5 greets",5, countGreetsFromNode(greetOutput, node2));
}
public int countGreetsFromNode(String output, String nodeId) {
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java?rev=1209978&r1=1209977&r2=1209978&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java Sat Dec 3 18:57:55 2011
@@ -66,6 +66,8 @@ public class CellarTestSupport {
static final String CELLAR_FEATURE_URL = String.format("mvn:org.apache.karaf.cellar/apache-karaf-cellar/%s/xml/features","3.0.0-SNAPSHOT");
+ static final String DEBUG_OPTS = " --java-opts \"-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=%s\"";
+
ExecutorService executor = Executors.newCachedThreadPool();
@Inject
@@ -120,8 +122,16 @@ public class CellarTestSupport {
* Creates a child instance that runs cellar.
*/
protected void createCellarChild(String name) {
+ createCellarChild(name, false, 0);
+ }
+
+ protected void createCellarChild(String name, boolean debug, int port) {
int instances = 0;
- System.err.println(executeCommand("admin:create --featureURL " + CELLAR_FEATURE_URL + " --feature cellar "+name));
+ String createCommad = "admin:create --featureURL " + CELLAR_FEATURE_URL + " --feature cellar ";
+ if(debug && port > 0) {
+ createCommad = createCommad + String.format(DEBUG_OPTS,port);
+ }
+ System.err.println(executeCommand(createCommad+" "+name));
System.err.println(executeCommand("admin:start " + name));
//Wait till the node is listed as Starting
@@ -142,6 +152,7 @@ public class CellarTestSupport {
} else {
System.err.println(".Timed Out!");
}
+
}
/**
@@ -150,7 +161,7 @@ public class CellarTestSupport {
protected void destroyCellarChild(String name) {
System.err.println(executeCommand("admin:connect " + name+" features:uninstall cellar"));
System.err.println(executeCommand("admin:stop " + name));
- System.err.println(executeCommand("admin:destroy " + name));
+ //System.err.println(executeCommand("admin:destroy " + name));
}
/**
@@ -160,7 +171,7 @@ public class CellarTestSupport {
*/
protected String getNodeIdOfChild(String name) {
String nodeId = null;
- String nodesList = executeCommand("admin:connect " + name+" cluster:nodes-list | grep \\\\*");
+ String nodesList = executeCommand("admin:connect " + name+" cluster:nodes-list | grep \\\\*",COMMAND_TIMEOUT,true);
String[] tokens = nodesList.split(" ");
if(tokens != null && tokens.length > 0) {
nodeId = tokens[tokens.length - 1].trim().replaceAll("\n","");