scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-03 04:07:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

we only need to run connectTest once in updateTest.bash

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@protonmail.com>
This commit is contained in:
Matthew Stidham
2021-03-12 15:46:04 -08:00
parent 4dd66e6a49
commit 934a442651
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
py-scripts/regression_test.sh
View File

@@ -4,6 +4,12 @@
# OPTION TWO: ./test_all_scripts.sh 4 5 : this command runs py-script commands (in testCommands array) that include the py-script options beginning with 4 and 5 (inclusive) in case function ret_case_num. # OPTION TWO: ./test_all_scripts.sh 4 5 : this command runs py-script commands (in testCommands array) that include the py-script options beginning with 4 and 5 (inclusive) in case function ret_case_num.
#Variables #Variables
FILE="/tmp/gui-update.lock"
if test -f "$FILE"; then
echo "Finish updating your GUI"
exit 0
fi
HOMEPATH=$(realpath ~) HOMEPATH=$(realpath ~)
if [[ ${#1} -gt 0 ]]; then if [[ ${#1} -gt 0 ]]; then

16
updateTest.bash
View File

@@ -160,15 +160,15 @@ pgrep java &>/dev/null && killall -9 java
sleep 1 sleep 1
#-daemon #-daemon
touch "$D_MODE" #touch "$D_MODE"
start_gui #start_gui
python3 ${scripts}/connectTest.py &> $CTLH #python3 ${scripts}/connectTest.py &> $CTLH#
echo "== HEADLESS =============================================" >> $ST #echo "== HEADLESS =============================================" >> $ST
head $CTLH >> $ST #head $CTLH >> $ST
echo "===============================================" >> $ST #echo "===============================================" >> $ST
rm -f "$D_MODE" #rm -f "$D_MODE"
pgrep java &>/dev/null && killall -9 java #pgrep java &>/dev/null && killall -9 java
start_gui start_gui
connect_fail=0 connect_fail=0
wait_8080 || connect_fail=1 wait_8080 || connect_fail=1