From 80857b3299ce5bad01e376521382d245ee4d4084 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Tue, 29 Jan 2019 11:10:58 +0000
Subject: [PATCH] MERGE FIX: TEST: fixup bitcoin functional

---
 .travis.yml               | 1 -
 .travis/test_06_script.sh | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37783f8261..0c9f1f43e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,6 @@ before_script:
   - set -o errexit; source .travis/test_05_before_script.sh
 script:
   - set -o errexit; source .travis/test_06_script.sh
-    - if [ "$RUN_BITCOIN_TESTS" = "true" ]; then BEGIN_FOLD bitcoin-functional-tests; DOCKER_EXEC test/bitcoin_functional/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended}; END_FOLD; fi
 after_script:
   - echo $TRAVIS_COMMIT_RANGE
   - echo $TRAVIS_COMMIT_LOG
diff --git a/.travis/test_06_script.sh b/.travis/test_06_script.sh
index 05a18ec03e..05e651db21 100755
--- a/.travis/test_06_script.sh
+++ b/.travis/test_06_script.sh
@@ -67,7 +67,7 @@ if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
 fi
 
 if [ "$RUN_BITCOIN_TESTS" = "true" ]; then
-  BEGIN_FOLD bitcoin-functional-tests
-  DOCKER_EXEC test/bitcoin_functional/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended}
-  END_FOLD
+    BEGIN_FOLD bitcoin-functional-tests
+    DOCKER_EXEC test/bitcoin_functional/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended}
+    END_FOLD
 fi