From 32f1bf26ec981c1c88a7da72f9921a425a0834e7 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Thu, 1 Nov 2018 14:43:23 -0400
Subject: [PATCH] move most extended tests to normal

---
 test/functional/test_runner.py | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 00a78f8a5d3..d709ddbdbcc 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -58,6 +58,11 @@
 BASE_SCRIPTS = [
     # Scripts that are run by the travis build process.
     # Longest test should go first, to favor running tests in parallel
+    'mempool_packages.py',
+    'feature_maxuploadtarget.py',
+    'p2p_timeouts.py',
+    'mining_getblocktemplate_longpoll.py',
+    'feature_fee_estimation.py',
     'wallet_hd.py',
     'wallet_backup.py',
     # vv Tests less than 5m vv
@@ -68,6 +73,7 @@
     # vv Tests less than 2m vv
     'wallet_basic.py',
     'wallet_labels.py',
+    'p2p_feefilter.py',
     'p2p_segwit.py',
     'wallet_dump.py',
     'wallet_listtransactions.py',
@@ -112,15 +118,18 @@
     'rpc_deprecated.py',
     'wallet_disable.py',
     'rpc_net.py',
+    'example_test.py',
     'wallet_keypool.py',
     'p2p_mempool.py',
     'mining_prioritisetransaction.py',
     'p2p_invalid_locator.py',
     'p2p_invalid_block.py',
+    'feature_bip68_sequence.py',
     'p2p_invalid_tx.py',
     'rpc_createmultisig.py',
     'feature_versionbits_warning.py',
     'rpc_preciousblock.py',
+    'feature_assumevalid.py',
     'wallet_importprunedfunds.py',
     'rpc_zmq.py',
     'rpc_signmessage.py',
@@ -130,6 +139,11 @@
     'rpc_bind.py --ipv4',
     'rpc_bind.py --ipv6',
     'rpc_bind.py --nonloopback',
+    'wallet_txn_doublespend.py',
+    'wallet_txn_clone.py --mineblock',
+    'feature_notifications.py',
+    'rpc_invalidateblock.py',
+    'feature_rbf.py',
     'mining_basic.py',
     'wallet_bumpfee.py',
     'rpc_named_arguments.py',
@@ -164,27 +178,7 @@
     # These tests are not run by the travis build process.
     # Longest test should go first, to favor running tests in parallel
     'feature_pruning.py',
-    # vv Tests less than 20m vv
-    'feature_fee_estimation.py',
-    # vv Tests less than 5m vv
-    'feature_maxuploadtarget.py',
-    'mempool_packages.py',
     'feature_dbcrash.py',
-    # vv Tests less than 2m vv
-    'feature_bip68_sequence.py',
-    'mining_getblocktemplate_longpoll.py',
-    'p2p_timeouts.py',
-    # vv Tests less than 60s vv
-    'p2p_feefilter.py',
-    # vv Tests less than 30s vv
-    'feature_assumevalid.py',
-    'example_test.py',
-    'wallet_txn_doublespend.py',
-    'wallet_txn_clone.py --mineblock',
-    'feature_notifications.py',
-    'rpc_invalidateblock.py',
-    'feature_rbf.py',
-    'feature_connect_coinbase.py'
 ]
 
 # Place EXTENDED_SCRIPTS first since it has the 3 longest running tests