This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 0510b55 HDDS-2902. execute_robot_test on unknown/unavailable
container should fail acceptance test
0510b55 is described below
commit 0510b55f8695518590d73cd3560a4d827efc7319
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Jan 23 09:18:31 2020 +0100
HDDS-2902. execute_robot_test on unknown/unavailable container should fail
acceptance test
Closes #464
---
hadoop-ozone/dist/src/main/compose/testlib.sh | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh
b/hadoop-ozone/dist/src/main/compose/testlib.sh
index 3f93c3a..03c9677 100755
--- a/hadoop-ozone/dist/src/main/compose/testlib.sh
+++ b/hadoop-ozone/dist/src/main/compose/testlib.sh
@@ -97,14 +97,20 @@ execute_robot_test(){
set +e
OUTPUT_NAME="$COMPOSE_ENV_NAME-$TEST_NAME-$CONTAINER"
OUTPUT_PATH="$RESULT_DIR_INSIDE/robot-$OUTPUT_NAME.xml"
- docker-compose -f "$COMPOSE_FILE" exec -T "$CONTAINER" mkdir -p
"$RESULT_DIR_INSIDE"
# shellcheck disable=SC2068
- docker-compose -f "$COMPOSE_FILE" exec -T -e
SECURITY_ENABLED="${SECURITY_ENABLED}" "$CONTAINER" python -m robot
${ARGUMENTS[@]} --log NONE -N "$TEST_NAME" --report NONE
"${OZONE_ROBOT_OPTS[@]}" --output "$OUTPUT_PATH" "$SMOKETEST_DIR_INSIDE/$TEST"
+ docker-compose -f "$COMPOSE_FILE" exec -T "$CONTAINER" mkdir -p
"$RESULT_DIR_INSIDE" \
+ && docker-compose -f "$COMPOSE_FILE" exec -T -e
SECURITY_ENABLED="${SECURITY_ENABLED}" "$CONTAINER" python -m robot
${ARGUMENTS[@]} --log NONE -N "$TEST_NAME" --report NONE
"${OZONE_ROBOT_OPTS[@]}" --output "$OUTPUT_PATH" "$SMOKETEST_DIR_INSIDE/$TEST"
+ local -i rc=$?
FULL_CONTAINER_NAME=$(docker-compose -f "$COMPOSE_FILE" ps | grep
"_${CONTAINER}_" | head -n 1 | awk '{print $1}')
docker cp "$FULL_CONTAINER_NAME:$OUTPUT_PATH" "$RESULT_DIR/"
set -e
+ if [[ ${rc} -gt 0 ]]; then
+ stop_docker_env
+ fi
+
+ return ${rc}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
