From a3b8b43663535f865646455001463217ba1132b4 Mon Sep 17 00:00:00 2001
From: Graham Krizek <graham@krizek.io>
Date: Fri, 28 Dec 2018 08:26:14 -0600
Subject: [PATCH 1/3] Update Travis base OS to Xenial

Updating the base OS used in Travis to Xenial from Trusty. This also updates Docker to 18.06 instead of 17.06 in CI.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7abc6e8ffd..258fd1b1c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+dist: xenial
 os: linux
 language: minimal
 cache:

From aa9aca85f1efff69d1d1dbd834ee457960a3fb24 Mon Sep 17 00:00:00 2001
From: Graham Krizek <graham@krizek.io>
Date: Fri, 28 Dec 2018 08:28:00 -0600
Subject: [PATCH 2/3] If tests are ran with (ASan + LSan), Docker needs access
 to ptrace

See https://github.com/google/sanitizers/issues/764 for details
---
 .travis/test_04_install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis/test_04_install.sh b/.travis/test_04_install.sh
index 3f74158117..a111387f10 100755
--- a/.travis/test_04_install.sh
+++ b/.travis/test_04_install.sh
@@ -15,6 +15,8 @@ export UBSAN_OPTIONS="suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressio
 env | grep -E '^(BITCOIN_CONFIG|CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|(ASAN|LSAN|TSAN|UBSAN)_OPTIONS)' | tee /tmp/env
 if [[ $HOST = *-mingw32 ]]; then
   DOCKER_ADMIN="--cap-add SYS_ADMIN"
+elif [[ $BITCOIN_CONFIG = *--with-sanitizers=*address* ]]; then # If ran with (ASan + LSan), Docker needs access to ptrace (https://github.com/google/sanitizers/issues/764)
+  DOCKER_ADMIN="--cap-add SYS_PTRACE"
 fi
 DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env $DOCKER_NAME_TAG)
 

From b6f0db69a9c9cdf101371720351935121590d3aa Mon Sep 17 00:00:00 2001
From: Graham Krizek <graham@krizek.io>
Date: Fri, 28 Dec 2018 08:28:38 -0600
Subject: [PATCH 3/3] Increase timeout of featuer_assumevalid test to fix flaky
 tests

---
 test/functional/feature_assumevalid.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/feature_assumevalid.py b/test/functional/feature_assumevalid.py
index 3d0467038d..12a4ce9aff 100755
--- a/test/functional/feature_assumevalid.py
+++ b/test/functional/feature_assumevalid.py
@@ -180,7 +180,7 @@ class AssumeValidTest(BitcoinTestFramework):
         for i in range(2202):
             p2p1.send_message(msg_block(self.blocks[i]))
         # Syncing 2200 blocks can take a while on slow systems. Give it plenty of time to sync.
-        p2p1.sync_with_ping(120)
+        p2p1.sync_with_ping(150)
         assert_equal(self.nodes[1].getblock(self.nodes[1].getbestblockhash())['height'], 2202)
 
         # Send blocks to node2. Block 102 will be rejected.