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

E2E: Changed return code handling in cico script #1268

Merged
merged 1 commit into from
Feb 12, 2019
Merged

E2E: Changed return code handling in cico script #1268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 1 addition & 14 deletions ee_tests/cico_run_e2e_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,20 +140,7 @@ docker exec "$TEST_CONTAINER_NAME" /usr/bin/Xvfb :99 -screen 0 1024x768x24 &
# Exec EE tests
docker exec "$TEST_CONTAINER_NAME" ./ts-protractor.sh | tee "$ARTIFACTS_DIR/protractor.log"

# Writing to and the grepping results required as webdriver fails
# intermittently - which results is failure reported even if tests pass

# We do not want to see any TimeoutError in the log
# as protractor does not trap these as errors
grep "TimeoutError" "$ARTIFACTS_DIR/protractor.log"
ret1=$?

# We do want to see that zero specs have failed
grep "0 failures" "$ARTIFACTS_DIR/protractor.log"
ret2=$?

if [ $ret1 -eq 1 ] && [ $ret2 -eq 0 ]; then RTN_CODE=0; else RTN_CODE=1; fi
### RTN_CODE=$?
RTN_CODE=$?

# Prepare test results for archiving
docker exec "$TEST_CONTAINER_NAME" ls -l ./target/screenshots
Expand Down