Author: challngr Date: Tue Jun 16 19:57:23 2015 New Revision: 1685899 URL: http://svn.apache.org/r1685899 Log: UIMA-4358 Update CLI tests for changed CLI.
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ClassSeparation.java uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ManagedReserveAndCancel.java uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ReserveAndCancel.java uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ServiceTester.java uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test1/resources/ducc.classes uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test10/resources/ducc.classes uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test11/resources/ducc.classes uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test12/resources/ducc.classes uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test2/resources/ducc.classes uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test3/resources/ducc.classes uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test4/resources/ducc.classes uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test5/resources/ducc.classes uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test6/resources/ducc.classes uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test7/resources/ducc.classes uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test8/resources/ducc.classes uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test9/resources/ducc.classes Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ClassSeparation.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ClassSeparation.java?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ClassSeparation.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ClassSeparation.java Tue Jun 16 19:57:23 2015 @@ -123,21 +123,16 @@ public class ClassSeparation String resid = null; reserve_props.setProperty("description", "Reserve And Cancel"); - reserve_props.setProperty("instance_memory_size", "4"); - reserve_props.setProperty("number_of_instances", "2"); + reserve_props.setProperty("memory_size", "4"); reserve_props.setProperty("scheduling_class", "fixed"); + reserve_props.setProperty("wait_for_completion", "true"); try { reserve = new DuccReservationSubmit(reserve_props); if ( reserve.execute() ) { resid = "" + reserve.getDuccId(); - success(testid, "Reservation", resid, "successful, rc =", ""+reserve.getReturnCode(), ":", reserve.getHostsAsString()); - String[] hosts = reserve.getHosts(); - System.out.println("" + hosts.length + " hosts assigned"); - if ( hosts.length > 0 ) { - for ( String h : reserve.getHosts() ) { - System.out.println(" " + h); - } - } + String host = reserve.getHost(); + success(testid, "Reservation", resid, "successful, rc =", ""+reserve.getReturnCode(), ":", host); + System.out.println(" " + host); } else { fail(testid, "Reservation failed, rc = " + reserve.getReturnCode()); } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ManagedReserveAndCancel.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ManagedReserveAndCancel.java?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ManagedReserveAndCancel.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ManagedReserveAndCancel.java Tue Jun 16 19:57:23 2015 @@ -75,6 +75,7 @@ public class ManagedReserveAndCancel reserve_props.setProperty("description", "Managed Reserve And Cancel " + testid); reserve_props.setProperty("process_executable_args", "30"); + reserve_props.setProperty("process_executable", "/bin/sleep"); reserve = new DuccManagedReservationSubmit(reserve_props); if ( reserve.execute() ) { success(testid, "Managed reservation", ""+reserve.getDuccId(), "submitted successfully, rc =" + reserve.getReturnCode()); Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ReserveAndCancel.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ReserveAndCancel.java?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ReserveAndCancel.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ReserveAndCancel.java Tue Jun 16 19:57:23 2015 @@ -57,20 +57,14 @@ public class ReserveAndCancel DuccReservationSubmit reserve; reserve_props.setProperty("description", "Reserve And Cancel"); - reserve_props.setProperty("instance_memory_size", "4"); - reserve_props.setProperty("number_of_instances", "2"); + reserve_props.setProperty("instance_memory_size", "28"); + reserve_props.setProperty("number_of_instances", "1"); reserve_props.setProperty("scheduling_class", "fixed"); reserve = new DuccReservationSubmit(reserve_props); if ( reserve.execute() ) { - resid = "" + reserve.getDuccId(); - success(testid, "Reservation", resid, "successful, rc =", ""+reserve.getReturnCode(), ":", reserve.getHostsAsString()); - String[] hosts = reserve.getHosts(); - System.out.println("" + hosts.length + " hosts assigned"); - if ( hosts.length > 0 ) { - for ( String h : reserve.getHosts() ) { - System.out.println(" " + h); - } - } + resid = "" + reserve.getDuccId(); + String host = reserve.getHost(); + success(testid, "Reservation", resid, "successful, rc =", ""+reserve.getReturnCode(), ":", host); } else { fail(testid, "Reservation failed, rc = " + reserve.getReturnCode()); } @@ -101,7 +95,7 @@ public class ReserveAndCancel reserve_props.setProperty("scheduling_class", "fixed"); reserve = new DuccReservationSubmit(reserve_props); if ( reserve.execute() ) { - fail(testid, "Reservation " +""+ reserve.getDuccId() + " successful but should have failed, rc =" + ""+reserve.getReturnCode() + ": " + reserve.getHostsAsString()); + fail(testid, "Reservation " +""+ reserve.getDuccId() + " successful but should have failed, rc =" + ""+reserve.getReturnCode() + ": " + reserve.getHost()); // designed to fail, if it doesn't we don't care about what is returned } else { success(testid, "Reservation failed as expected, rc = " + ""+reserve.getReturnCode()); Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ServiceTester.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ServiceTester.java?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ServiceTester.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/ServiceTester.java Tue Jun 16 19:57:23 2015 @@ -474,7 +474,14 @@ public class ServiceTester props.setProperty("driver_jvm_args", "-Xmx500M"); props.setProperty("process_descriptor_AE", "org.apache.uima.ducc.test.randomsleep.FixedSleepAE"); props.setProperty("process_memory_size", "2"); - props.setProperty("classpath", "${DUCC_HOME}/lib/uima-ducc/examples/*"); + + String dh = "${DUCC_HOME}"; + String classpath = dh + "/lib/uima-ducc/examples/*"; + classpath = classpath + ":/" + dh + "/apache-uima/lib/*"; + classpath = classpath + ":/" + dh + "/apache-uima/apache-activemq/lib/*"; + classpath = classpath + ":/" + dh + "/apache-uima/apache-activemq/lib/optional/*"; + + props.setProperty("classpath", classpath); props.setProperty("process_jvm_args", "-Xmx100M "); props.setProperty("process_thread_count", "2"); props.setProperty("process_per_item_time_max", "5"); @@ -1228,14 +1235,20 @@ public class ServiceTester { String testId = "UIMA Service"; + String dh = "${DUCC_HOME}"; + String classpath = dh + "/lib/uima-ducc/examples/*"; + classpath = classpath + ":/" + dh + "/apache-uima/lib/*"; + classpath = classpath + ":/" + dh + "/apache-uima/apache-activemq/lib/*"; + classpath = classpath + ":/" + dh + "/apache-uima/apache-activemq/lib/optional/*"; + String[] service_props = { "--description", "Test Service 1", "--process_jvm_args", "-Xmx100M -DdefaultBrokerURL=", // note broken, gets fixed in a while - "--classpath", "${DUCC_HOME}/lib/uima-ducc/examples/*:${DUCC_HOME}/apache-uima/lib/*:${DUCC_HOME}/apache-uima/apache-activemq/lib/*:${DUCC_HOME}/examples/simple/resources/service", + "--classpath", classpath, "--service_ping_arguments", "broker-jmx-port=1099", "--environment", "AE_INIT_TIME=5000 AE_INIT_RANGE=1000 INIT_ERROR=0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path", "--process_memory_size", "15", - "--process_DD", "${DUCC_HOME}/examples/simple/resources/service/Service_FixedSleep_1.xml", + "--process_descriptor_DD", "${DUCC_HOME}/examples/simple/resources/service/Service_FixedSleep_1.xml", "--scheduling_class", "fixed", "--working_directory", "${HOME}", "--register", // Has no specification argument Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test1/resources/ducc.classes URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test1/resources/ducc.classes?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test1/resources/ducc.classes (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test1/resources/ducc.classes Tue Jun 16 19:57:23 2015 @@ -74,7 +74,6 @@ Class fixed-base { priority = 5 abstract = true max-processes = 10 - max-allotment = 10 } Class fixed fixed-base { default = true} @@ -87,7 +86,6 @@ Class reserve-base { priority = 1 abstract = true max-machines = 10 - max-allotment = 10 } Class reserve reserve-base { default = true } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test10/resources/ducc.classes URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test10/resources/ducc.classes?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test10/resources/ducc.classes (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test10/resources/ducc.classes Tue Jun 16 19:57:23 2015 @@ -72,7 +72,6 @@ Class fixed-base { nodepool = --default-- priority = 5 abstract = true - max-allotment = 10 } Class fixed fixed-base { default = true} @@ -84,7 +83,6 @@ Class reserve-base { nodepool = --default-- priority = 1 abstract = true - max-allotment = 10 } Class reserve reserve-base { default = true } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test11/resources/ducc.classes URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test11/resources/ducc.classes?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test11/resources/ducc.classes (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test11/resources/ducc.classes Tue Jun 16 19:57:23 2015 @@ -73,7 +73,6 @@ Class fixed-base { nodepool = --default-- priority = 5 abstract = true - max-allotment = 10 } Class fixed fixed-base { default = true } @@ -85,7 +84,6 @@ Class reserve-base { nodepool = --default-- priority = 1 abstract = true - max-allotment = 10 } Class reserve reserve-base { default = true } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test12/resources/ducc.classes URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test12/resources/ducc.classes?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test12/resources/ducc.classes (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test12/resources/ducc.classes Tue Jun 16 19:57:23 2015 @@ -72,7 +72,6 @@ Class fixed-base { nodepool = --default-- priority = 5 abstract = true - max-allotment = 10 } Class fixed fixed-base { default = true} @@ -84,7 +83,6 @@ Class reserve-base { nodepool = --default-- priority = 1 abstract = true - max-allotment = 10 } Class reserve reserve-base { default = true } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test2/resources/ducc.classes URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test2/resources/ducc.classes?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test2/resources/ducc.classes (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test2/resources/ducc.classes Tue Jun 16 19:57:23 2015 @@ -72,7 +72,6 @@ Class fixed-base { nodepool = --default-- priority = 5 abstract = true - max-allotment = 10 } Class fixed fixed-base { default = true} @@ -84,7 +83,6 @@ Class reserve-base { nodepool = --default-- priority = 1 abstract = true - max-allotment = 10 } Class reserve reserve-base { default = true } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test3/resources/ducc.classes URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test3/resources/ducc.classes?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test3/resources/ducc.classes (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test3/resources/ducc.classes Tue Jun 16 19:57:23 2015 @@ -72,7 +72,6 @@ Class fixed-base { nodepool = --default-- priority = 5 abstract = true - max-allotment = 10 } Class fixed fixed-base { default = true} @@ -84,7 +83,6 @@ Class reserve-base { nodepool = --default-- priority = 1 abstract = true - max-allotment = 10 } Class reserve reserve-base { default = true } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test4/resources/ducc.classes URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test4/resources/ducc.classes?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test4/resources/ducc.classes (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test4/resources/ducc.classes Tue Jun 16 19:57:23 2015 @@ -72,7 +72,6 @@ Class fixed-base { nodepool = --default-- priority = 5 abstract = true - max-allotment = 10 } Class fixed fixed-base { default = true} @@ -84,7 +83,6 @@ Class reserve-base { nodepool = --default-- priority = 1 abstract = true - max-allotment = 10 } Class reserve reserve-base { default = true } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test5/resources/ducc.classes URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test5/resources/ducc.classes?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test5/resources/ducc.classes (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test5/resources/ducc.classes Tue Jun 16 19:57:23 2015 @@ -72,7 +72,6 @@ Class fixed-base { nodepool = --default-- priority = 5 abstract = true - max-allotment = 10 } Class fixed fixed-base { default = true} @@ -84,7 +83,6 @@ Class reserve-base { nodepool = --default-- priority = 1 abstract = true - max-allotment = 10 } Class reserve reserve-base { default = true } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test6/resources/ducc.classes URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test6/resources/ducc.classes?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test6/resources/ducc.classes (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test6/resources/ducc.classes Tue Jun 16 19:57:23 2015 @@ -72,7 +72,6 @@ Class fixed-base { nodepool = --default-- priority = 5 abstract = true - max-allotment = 10 } Class fixed fixed-base { default = true} @@ -84,7 +83,6 @@ Class reserve-base { nodepool = --default-- priority = 1 abstract = true - max-allotment = 10 } Class reserve reserve-base { default = true } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test7/resources/ducc.classes URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test7/resources/ducc.classes?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test7/resources/ducc.classes (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test7/resources/ducc.classes Tue Jun 16 19:57:23 2015 @@ -72,7 +72,6 @@ Class fixed-base { nodepool = --default-- priority = 5 abstract = true - max-allotment = 10 } Class fixed fixed-base { default = true} @@ -84,7 +83,6 @@ Class reserve-base { nodepool = --default-- priority = 1 abstract = true - max-allotment = 10 } Class reserve reserve-base { default = true } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test8/resources/ducc.classes URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test8/resources/ducc.classes?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test8/resources/ducc.classes (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test8/resources/ducc.classes Tue Jun 16 19:57:23 2015 @@ -72,7 +72,6 @@ Class fixed-base { nodepool = --default-- priority = 5 abstract = true - max-allotment = 10 } Class fixed fixed-base { default = true} @@ -84,7 +83,6 @@ Class reserve-base { nodepool = --default-- priority = 1 abstract = true - max-allotment = 10 } Class reserve reserve-base { default = true } Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test9/resources/ducc.classes URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test9/resources/ducc.classes?rev=1685899&r1=1685898&r2=1685899&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test9/resources/ducc.classes (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/test/resources/node_configuration_data/test9/resources/ducc.classes Tue Jun 16 19:57:23 2015 @@ -72,7 +72,6 @@ Class fixed-base { nodepool = --default-- priority = 5 abstract = true - max-allotment = 10 } Class fixed fixed-base { default = true} @@ -84,7 +83,6 @@ Class reserve-base { nodepool = --default-- priority = 1 abstract = true - max-allotment = 10 } Class reserve reserve-base { default = true }