From 18f4dd240631df55064696de865b6d818cb76ba7 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean@seanmonstar.com>
Date: Wed, 9 May 2018 16:02:49 -0700
Subject: [PATCH] chore(ci): remove flaky tests from failing CI

---
 .travis.yml          | 5 ++++-
 Cargo.toml           | 8 ++++++--
 tests/integration.rs | 5 ++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b9bd8e49..15bbe672 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,15 @@ matrix:
     fast_finish: true
     include:
         - rust: nightly
-          env: FEATURES="--features nightly" HYPER_DOCS="1"
+          env: FEATURES="--no-default-features --features runtime,nightly" HYPER_DOCS="1"
         - rust: beta
+          env: FEATURES="--no-default-features --features runtime"
         - rust: stable
+          env: FEATURES="--no-default-features --features runtime"
         - rust: stable
           env: FEATURES="--no-default-features"
         - rust: 1.21.0
+          env: FEATURES="--no-default-features --features runtime"
 
 cache:
     apt: true
diff --git a/Cargo.toml b/Cargo.toml
index 219e1cf2..05b04fe6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,8 +47,10 @@ spmc = "0.2"
 url = "1.0"
 
 [features]
-default = ["runtime"]
-nightly = []
+default = [
+    "__internal_flaky_tests",
+    "runtime",
+]
 runtime = [
     "futures-cpupool",
     "net2",
@@ -58,6 +60,8 @@ runtime = [
     "tokio-tcp",
     "tokio-timer",
 ]
+nightly = []
+__internal_flaky_tests = []
 
 [[example]]
 name = "client"
diff --git a/tests/integration.rs b/tests/integration.rs
index 8b9553f0..16592877 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -140,8 +140,11 @@ t! {
             ;
 }
 
+// In rare cases, the h2 client connection does not shutdown, resulting
+// in this test simply hanging... :(
+#[cfg(feature = "__internal_flaky_tests")]
 t! {
-    get_parallel_http2,
+    http2_parallel_10,
     parallel: 0..10
 }