add eval to run_test method

Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-11-11 11:24:59 -08:00
parent e128b2d44f
commit 47bdaf3a4d

View File

@@ -159,33 +159,35 @@ if [[ ${#SHORT} -gt 0 ]]; then
testCommands=(
# run_l3_longevity
# "./test_ip_variable_time.py --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --test_duration 15s --output_format csv --layer3_cols $COL_NAMES --debug --mgr $MGR --traffic_type lf_udp"
"./lf_ap_auto_test.py
--mgr $MGR --port 8080 --lf_user lanforge --lf_password lanforge \
--instance_name ap-auto-instance --config_name test_con --upstream 1.1.eth2 \
--dut5_0 '$DUT5 (2)' \
--dut2_0 '$DUT2 (1)' \
--max_stations_2 100 \
--max_stations_5 100 \
--max_stations_dual 200 \
--radio2 1.1.wiphy0 \
--radio2 1.1.wiphy1 \
--set 'Basic Client Connectivity' 1 \
--set 'Multi Band Performance' 1 \
--set 'Skip 2.4Ghz Tests' 1 \
--set 'Skip 5Ghz Tests' 1
--set 'Throughput vs Pkt Size' 0 \
--set 'Capacity' 0 \
--set 'Stability' 0 \
--set 'Band-Steering' 0 \
--set 'Multi-Station Throughput vs Pkt Size' 0 \
--set 'Long-Term' 0 \
--pull_report \
--influx_host c7-graphana \
--influx_port 8086 \
--influx_org Candela \
--influx_token=-u_Wd-L8o992701QF0c5UmqEp7w7Z7YOMaWLxOMgmHfATJGnQbbmYyNxHBR9PgD6taM_tcxqJl6U8DjU1xINFQ== \
--influx_bucket ben \
--influx_tag testbed Ferndale-01"
"./lf_ap_auto_test.py \
--mgr ${MGR} --port 8080 --lf_user lanforge --lf_password lanforge \
--instance_name ap-auto-instance \
--config_name test_con \
--upstream 1.1.eth2 \
--dut5_0 'linksys-8450 Default-SSID-5gl c4:41:1e:f5:3f:25 (2)' \
--dut2_0 'linksys-8450 Default-SSID-2g c4:41:1e:f5:3f:24 (1)' \
--max_stations_2 100 \
--max_stations_5 100 \
--max_stations_dual 200 \
--radio2 1.1.wiphy0 \
--radio2 1.1.wiphy1 \
--set 'Basic Client Connectivity' 1 \
--set 'Multi Band Performance' 1 \
--set 'Skip 2.4Ghz Tests' 1 \
--set 'Skip 5Ghz Tests' 1 \
--set 'Throughput vs Pkt Size' 0 \
--set 'Capacity' 0 \
--set 'Stability' 0 \
--set 'Band-Steering' 0 \
--set 'Multi-Station Throughput vs Pkt Size' 0 \
--set 'Long-Term' 0 \
--pull_report \
--influx_host c7-graphana \
--influx_port 8086 \
--influx_org Candela \
--influx_token=-u_Wd-8o992701QF0c5UmqEp7w7Z7YOMaWLxOMgmHfATJGnQbbmYyNxHBR9PgD6taM_tcxqJl6U8DjU1xINFQ== \
--influx_bucket ben \
--influx_tag testbed Ferndale-01"
)
else
testCommands=(
@@ -218,7 +220,7 @@ else
#./grafana_profile
"./layer3_test.py --mgr $MGR --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --radio $RADIO_USED"
"./layer4_test.py --mgr $MGR --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY"
"./lf_ap_auto_test.py
"./lf_ap_auto_test.py \
--mgr $MGR --port 8080 --lf_user lanforge --lf_password lanforge \
--instance_name ap-auto-instance --config_name test_con --upstream 1.1.eth2 \
--dut5_0 '$DUT5 (2)' \
@@ -504,7 +506,7 @@ function test() {
echo_print
echo "$testcommand"
start=$(date +%s)
$testcommand > "${TEST_DIR}/${NAME}.txt" 2> "${TEST_DIR}/${NAME}_stderr.txt"
eval "$testcommand" 1> "${TEST_DIR}/${NAME}.txt" 2> "${TEST_DIR}/${NAME}_stderr.txt"
chmod 664 "${TEST_DIR}/${NAME}.txt"
FILESIZE=$(stat -c%s "${TEST_DIR}/${NAME}_stderr.txt") || 0
end=$(date +%s)
@@ -604,6 +606,7 @@ function html_generator() {
rm -f "${HOMEPATH}/html-reports/latest.html"
fi
ln -s "${fname}" "${HOMEPATH}/html-reports/latest.html"
echo "Saving HTML file to disk"
#HOSTNAME=$(ip -4 addr show enp3s0 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
#content="View the latest regression report at /html-reports/latest.html"
#echo "${content}"