From 1415ac4209e8d762d7e6272c3d608bc5b9c3dd19 Mon Sep 17 00:00:00 2001 From: Nick Vatamaniuc Date: Wed, 8 Jan 2020 17:38:59 -0500 Subject: Remove EUnit retries on failure Since we switched from Travis to Jenkins, let's see how tests run without retries in the new environment. For reference, retries were introduced in: https://github.com/apache/couchdb/commit/220462a1dd2d921fc4ecba3488f5fedefb75217f --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Makefile b/Makefile index af03a6fa9..8ffdba384 100644 --- a/Makefile +++ b/Makefile @@ -173,16 +173,7 @@ eunit: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1 eunit: couch @COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR) setup_eunit 2> /dev/null @for dir in $(subdirs); do \ - tries=0; \ - while true; do \ - COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR) -r eunit $(EUNIT_OPTS) apps=$$dir ; \ - if [ $$? -eq 0 ]; then \ - break; \ - else \ - tries=$$((tries+1)); \ - [ $$tries -gt 2 ] && exit 1; \ - fi \ - done \ + COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR) -r eunit $(EUNIT_OPTS) apps=$$dir || exit 1; \ done -- cgit v1.2.1