From 594ce01b1993b556f7ee12b7efd4045c466520cb Mon Sep 17 00:00:00 2001 From: Yaro Kasear Date: Wed, 7 May 2025 10:34:24 -0500 Subject: [PATCH] Refactor speedtest command to use a variable for header extraction and simplify server options for improved readability --- runtest.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/runtest.sh b/runtest.sh index ea4824c..08171c6 100755 --- a/runtest.sh +++ b/runtest.sh @@ -152,8 +152,11 @@ echo -e "Subject: Test ${BOOT_ID} Started\n\nTest ${BOOT_ID} has commenced." | m FAILED_START=$(get_tx_failed) +DUMMY_SPEEDTEST=$(speedtest --format=csv --output-header) +SPEEDTEST_HEADER=$(echo "$DUMMY_SPEEDTEST" | head -n 1) + # CSV setup -TEST_HEADER="StartTimestamp,EndTimestamp,Link,Level,Noise,BSSID,TX Bitrate,RX Bitrate,$(speedtest --csv-header),TX Failures,Channel,Frequency,Packet Loss,Jitter,LocalTCPUp,LocalTCPDown,LocalUDPUp,LocalUDPDown,RemoteTCPUp,RemoteTCPDown,RemoteUDPUp,RemoteUDPDown" +TEST_HEADER="StartTimestamp,EndTimestamp,Link,Level,Noise,BSSID,TX Bitrate,RX Bitrate,$(SPEEDTEST_HEADER),TX Failures,Channel,Frequency,Packet Loss,Jitter,LocalTCPUp,LocalTCPDown,LocalUDPUp,LocalUDPDown,RemoteTCPUp,RemoteTCPDown,RemoteUDPUp,RemoteUDPDown" LISTENER_HEADER="Timestamp,ClientsOnAP,ClientsOnChannel,APsOnChannel,AvgAPSignal,StrongestAPSignal,UnlinkedDevices,NumberofBSSIDsOnSSID,AvgSSIDSignal,MaxSSIDSignal,NumberofChannelsOnSSID,PacketCount,Deadpoints" echo "Speedtest,LocalTCPUp,LocalTCPDown,LocalUDPUp,LocalUDPDown,RemoteTCPUp,RemoteTCPDown,RemoteUDPUp,RemoteUDPDown" >"${TEST_FILE}_durations.csv" @@ -219,7 +222,8 @@ for ((COUNTER = 1; COUNTER <= NUM_TESTS; COUNTER++)); do for ((retry = 1; retry <= MAX_RETRIES; retry++)); do SECONDS=0 log "Speed test attempt $retry" - speed_results=$(speedtest --secure --csv --server 57444 --server 16797 --server 40818 --server 24079 --server 55661 2>/dev/null || true) + # speed_results=$(speedtest --secure --csv --server 57444 --server 16797 --server 40818 --server 24079 --server 55661 2>/dev/null || true) + speed_results=$(speedtest --format=csv 2>/dev/null || true) speedtest_duration=$SECONDS [[ -n "$speed_results" ]] && break warn "Speedtest failed. Retrying in $RETRY_DELAY seconds..."