Author: objectiser Date: 2010-06-28 09:20:41 -0400 (Mon, 28 Jun 2010) New Revision: 814 Modified: branches/RiftSaw-2.1.x/integration-tests/pom.xml branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTestSetup.java branches/RiftSaw-2.1.x/qa/hudson-riftsaw-db.sh branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jboss.sh branches/RiftSaw-2.1.x/qa/hudson-riftsaw-soa-p.sh branches/RiftSaw-2.1.x/qa/hudson-riftsaw-ws.sh Log: RIFTSAW-229 - add config time for test delay Modified: branches/RiftSaw-2.1.x/integration-tests/pom.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/pom.xml 2010-06-28 13:16:27 UTC (rev 813) +++ branches/RiftSaw-2.1.x/integration-tests/pom.xml 2010-06-28 13:20:41 UTC (rev 814) @@ -15,6 +15,7 @@ <jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version> <jboss.common.version>1.2.1.GA</jboss.common.version> <jboss.version>5.1.0.GA</jboss.version> + <test.delay>20000</test.delay> </properties> <dependencies> <dependency> @@ -535,6 +536,10 @@ <value>${ws.stack}</value> </property> <property> + <name>test.delay</name> + <value>${test.delay}</value> + </property> + <property> <name>java.naming.factory.initial</name> <value>org.jnp.interfaces.NamingContextFactory</value> </property> Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTestSetup.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTestSetup.java 2010-06-28 13:16:27 UTC (rev 813) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTestSetup.java 2010-06-28 13:20:41 UTC (rev 814) @@ -130,10 +130,12 @@ Thread.currentThread().setContextClassLoader(cl); } - // Temporary wait until able to sync detect deployed ok try { + String testDelayStr=System.getProperty("test.delay","20000"); + long testDelay=Long.parseLong(testDelayStr); + synchronized(this) { - wait(40* 1000); + wait(testDelay); } } catch(Exception e) { e.printStackTrace(); Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-db.sh =================================================================== --- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-db.sh 2010-06-28 13:16:27 UTC (rev 813) +++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-db.sh 2010-06-28 13:20:41 UTC (rev 814) @@ -20,8 +20,9 @@ WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" STARTUP_TIME="6" +TEST_DELAY="40000" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit tests Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jboss.sh =================================================================== --- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jboss.sh 2010-06-28 13:16:27 UTC (rev 813) +++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jboss.sh 2010-06-28 13:20:41 UTC (rev 814) @@ -15,12 +15,13 @@ JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" STARTUP_TIME="6" +TEST_DELAY="40000" WS_STACK="native" WS_VERSION="3.2.2.GA" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-soa-p.sh =================================================================== --- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-soa-p.sh 2010-06-28 13:16:27 UTC (rev 813) +++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-soa-p.sh 2010-06-28 13:20:41 UTC (rev 814) @@ -20,8 +20,9 @@ WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" STARTUP_TIME="6" +TEST_DELAY="40000" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit tests Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-ws.sh =================================================================== --- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-ws.sh 2010-06-28 13:16:27 UTC (rev 813) +++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-ws.sh 2010-06-28 13:20:41 UTC (rev 814) @@ -18,8 +18,9 @@ WS_VERSION="3.2.2.GA" STARTUP_TIME="6" +TEST_DELAY="40000" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR -Dws.version=$WS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR -Dws.version=$WS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit test