Change l7vsadm test number.

[ultramonkey-l7/ultramonkey-l7-v3.git] / test / script / l7vsadm / l7vsadm-3-2-5.sh

diff --git a/test/script/l7vsadm/l7vsadm-3-2-5.sh b/test/script/l7vsadm/l7vsadm-3-2-5.sh
index 294f1d8..f7827fd 100755 (executable)
--- a/test/script/l7vsadm/l7vsadm-3-2-5.sh
+++ b/test/script/l7vsadm/l7vsadm-3-2-5.sh
@@ -11,73 +11,12 @@ then
 fi
 usleep 100000
 
-RET=`$L7VSADM -V`
-EXPECT="Layer-7 Virtual Server version 3.0.0-1
-L7vsd Log Level:
-Category                       Level
-l7vsd_network                  warn
-l7vsd_network_qos              warn
-l7vsd_network_bandwidth        warn
-l7vsd_network_num_connection   warn
-l7vsd_network_access           warn
-l7vsd_mainthread               warn
-l7vsd_virtualservice           warn
-l7vsd_virtualservice_thread    warn
-l7vsd_session                  warn
-l7vsd_session_thread           warn
-l7vsd_realserver               warn
-l7vsd_sorryserver              warn
-l7vsd_module                   warn
-l7vsd_replication              warn
-l7vsd_replication_sendthread   warn
-l7vsd_parameter                warn
-l7vsd_logger                   warn
-l7vsd_command                  warn
-l7vsd_start_stop               warn
-l7vsd_system                   warn
-l7vsd_system_memory            warn
-l7vsd_system_endpoint          warn
-l7vsd_system_signal            warn
-l7vsd_system_environment       warn
-l7vsd_snmpbridge               warn
-l7vsd_protocol                 warn
-l7vsd_schedule                 warn
-
-Replication Mode:
-SINGLE
-
-SNMPAgent Connection Status:
-non-connecting
-
-SNMPAgent Log Level:
-Category                       Level
-snmpagent_start_stop           warn
-snmpagent_manager_receive      warn
-snmpagent_manager_send         warn
-snmpagent_l7vsd_receive        warn
-snmpagent_l7vsd_send           warn
-snmpagent_logger               warn
-snmpagent_parameter            warn
-snmpagent_system               warn
-snmpagent_system_memory        warn
-snmpagent_system_endpoint      warn
-snmpagent_system_signal        warn
-snmpagent_system_environment   warn
-
-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
-     SorryAddress:Port Sorry_cc Sorry_flag
-     QoS-up   Throughput-up
-     QoS-down Throughput-down
-     SSL_config_file
-     Socket option
-     Access_log_flag
-     Access_log_file
-     Access_log_rotate option
-  -> RemoteAddress:Port           Forward Weight ActiveConn InactConn"
+RET=`$L7VSADM -V -x 2>&1 | grep "PARSE ERROR : list option not found:-x"`
+EXPECT="PARSE ERROR : list option not found:-x"
 
 if [ "${RET}" != "${EXPECT}" ]
 then
-        echo "Test failed: $L7VSADM -V"
+        echo "Test failed: $L7VSADM -V -x"
         exit 1
 fi