Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#229 fixed startup to support webview #233

Merged
merged 2 commits into from
Apr 21, 2023
Merged

#229 fixed startup to support webview #233

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a652aa
#229 fixed startup to support webview
Apr 21, 2023
0f4d5d2
#229: for stopped state return invalid 1 status to init recovery
Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions zebrunner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,9 @@ export SIMULATORS=${metaDataFolder}/simulators.txt
udid=`echo $REPLY | jq -r ".Properties.SerialNumber"`
. ./configs/getDeviceArgs.sh $udid

ps -ef | grep zebrunner.sh | grep start | grep $udid > /dev/null 2>&1
status-device $udid
if [ $? -eq 0 ]; then
echo "do nothing as starting is already in progress for $DEVICE_NAME ($DEVICE_UDID)"
echo "do nothing as state is valid (healthy or starting) for $DEVICE_NAME ($DEVICE_UDID)"
return 0
fi

Expand All @@ -423,7 +423,8 @@ export SIMULATORS=${metaDataFolder}/simulators.txt
# #208: start processes not as a child of existing one: https://stackoverflow.com/questions/20338162/how-can-i-launch-a-new-process-that-is-not-a-child-of-the-original-process
# only in this case appium has access to webview content. Otherwise, such issue occur:
# "An unknown server-side error occurred while processing the command. Original error: Could not navigate to webview! Err: Failed to receive any data within the timeout: 5000"
( start-device $udid & )
#( start-device $udid & )
( ${BASEDIR}/zebrunner.sh start $udid & )
fi

read
Expand Down Expand Up @@ -456,7 +457,8 @@ export SIMULATORS=${metaDataFolder}/simulators.txt
# #208: start processes not as a child of existing one: https://stackoverflow.com/questions/20338162/how-can-i-launch-a-new-process-that-is-not-a-child-of-the-original-process
# only in this case appium has access to webview content. Otherwise, such issue occur:
# "An unknown server-side error occurred while processing the command. Original error: Could not navigate to webview! Err: Failed to receive any data within the timeout: 5000"
( start-device $udid & )
#( start-device $udid & )
( ${BASEDIR}/zebrunner.sh start $udid & )
done < ${devices}

launchctl load $HOME/Library/LaunchAgents/ZebrunnerDevicesManager.plist > /dev/null 2>&1
Expand Down Expand Up @@ -549,7 +551,6 @@ export SIMULATORS=${metaDataFolder}/simulators.txt
fi

echo "Starting iSTF ios-device: ${udid} device name : ${name}"

# Specify concrete supported v17.1.0 node for STF
nvm use v17.1.0

Expand Down Expand Up @@ -712,7 +713,8 @@ export SIMULATORS=${metaDataFolder}/simulators.txt
# #208: start processes not as a child of existing one: https://stackoverflow.com/questions/20338162/how-can-i-launch-a-new-process-that-is-not-a-child-of-the-original-process
# only in this case appium has access to webview content. Otherwise, such issue occur:
# "An unknown server-side error occurred while processing the command. Original error: Could not navigate to webview! Err: Failed to receive any data within the timeout: 5000"
( start-device $udid & )
#( start-device $udid & )
( ${BASEDIR}/zebrunner.sh start $udid & )
fi
}

Expand Down Expand Up @@ -872,7 +874,7 @@ export SIMULATORS=${metaDataFolder}/simulators.txt
launchctl list | grep $DEVICE_UDID | grep "com.zebrunner.mcloud" > /dev/null 2>&1
if [ $? -eq 1 ]; then
echo "$DEVICE_NAME ($DEVICE_UDID) is stopped."
return 0
return 1
fi

ps -ef | grep zebrunner.sh | grep start | grep $udid > /dev/null 2>&1
Expand All @@ -889,13 +891,18 @@ export SIMULATORS=${metaDataFolder}/simulators.txt
if curl --max-time 10 -Is "http://localhost:$appium_port/wd/hub/status-wda" | head -1 | grep -q '200 OK'
then
echo "$DEVICE_NAME ($DEVICE_UDID) is healthy."
return 0
else
echo "$DEVICE_NAME ($DEVICE_UDID) is unhealthy!"
return 1
fi
else
echo "$DEVICE_NAME ($DEVICE_UDID) is disconnected!"
return 1
fi

return 1

}

backup() {
Expand Down