forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(ci): re-enable CI running on beta

Browse Source
This commit is contained in:
Sean McArthur
2019-10-18 13:35:07 -07:00
parent 7e31fd88a8
commit 2d6bbd2cd8
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.travis.yml
View File

@@ -1,27 +1,27 @@
language: rust language: rust
#sudo: true # Required for functional IPv6 (forces VM instead of Docker). sudo: true # Required for functional IPv6 (forces VM instead of Docker).
dist: trusty dist: trusty
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
- rust: nightly - rust: nightly
env: FEATURES="--no-default-features --features runtime,nightly" env: FEATURES="--no-default-features --features runtime,unstable-stream,nightly"
#- rust: beta - rust: beta
# env: FEATURES="--no-default-features --features runtime,__internal_happy_eyeballs_tests" env: FEATURES="--no-default-features --features runtime,unstable-stream,__internal_happy_eyeballs_tests"
#- rust: stable #- rust: stable
# env: FEATURES="--no-default-features --features runtime,__internal_happy_eyeballs_tests" # env: FEATURES="--no-default-features --features runtime,unstable-stream,__internal_happy_eyeballs_tests"
- rust: nightly #stable - rust: beta #stable
env: FEATURES="--no-default-features" env: FEATURES="--no-default-features"
# Minimum Supported Rust Version # Minimum Supported Rust Version
#- rust: 1.36.0 #- rust: 1.39.0
# env: FEATURES="--no-default-features --features runtime" BUILD_ONLY="1" # env: FEATURES="--no-default-features --features runtime" BUILD_ONLY="1"
#before_script: before_script:
# Add an IPv6 config - see the corresponding Travis issue # Add an IPv6 config - see the corresponding Travis issue
# https://github.com/travis-ci/travis-ci/issues/83 # https://github.com/travis-ci/travis-ci/issues/83
#- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
# sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'; sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
# fi fi
script: script:
- 'if [ "$BUILD_ONLY" != "1" ]; then cargo test $FEATURES -- --test-threads=1; fi' - 'if [ "$BUILD_ONLY" != "1" ]; then cargo test $FEATURES -- --test-threads=1; fi'

2
Cargo.toml
View File

@@ -200,4 +200,4 @@ required-features = ["runtime", "unstable-stream"]
[[test]] [[test]]
name = "server" name = "server"
path = "tests/server.rs" path = "tests/server.rs"
required-features = ["runtime", "unstable-stream"] required-features = ["runtime"]

18
tests/server.rs
View File

@@ -1,6 +1,5 @@
#![feature(async_closure)]
#![deny(warnings)] #![deny(warnings)]
#![warn(rust_2018_idioms)] #![deny(rust_2018_idioms)]
use std::net::{TcpStream, Shutdown, SocketAddr}; use std::net::{TcpStream, Shutdown, SocketAddr};
use std::io::{self, Read, Write}; use std::io::{self, Read, Write};
@@ -19,7 +18,7 @@ use futures_core::future::BoxFuture;
use futures_util::future::{self, Either, FutureExt}; use futures_util::future::{self, Either, FutureExt};
use futures_util::stream::StreamExt; use futures_util::stream::StreamExt;
use futures_util::try_future::{self, TryFutureExt}; use futures_util::try_future::{self, TryFutureExt};
use futures_util::try_stream::TryStreamExt; //use futures_util::try_stream::TryStreamExt;
use http::header::{HeaderName, HeaderValue}; use http::header::{HeaderName, HeaderValue};
use tokio_net::driver::Handle; use tokio_net::driver::Handle;
use tokio_net::tcp::{TcpListener, TcpStream as TkTcpStream}; use tokio_net::tcp::{TcpListener, TcpStream as TkTcpStream};
@@ -1469,6 +1468,7 @@ fn max_buf_size() {
rt.block_on(fut).expect_err("should TooLarge error"); rt.block_on(fut).expect_err("should TooLarge error");
} }
#[cfg(feature = "unstable-stream")]
#[test] #[test]
fn streaming_body() { fn streaming_body() {
let _ = pretty_env_logger::try_init(); let _ = pretty_env_logger::try_init();
@@ -1584,6 +1584,7 @@ fn http2_service_error_sends_reset_reason() {
assert_eq!(h2_err.reason(), Some(h2::Reason::INADEQUATE_SECURITY)); assert_eq!(h2_err.reason(), Some(h2::Reason::INADEQUATE_SECURITY));
} }
#[cfg(feature = "unstable-stream")]
#[test] #[test]
fn http2_body_user_error_sends_reset_reason() { fn http2_body_user_error_sends_reset_reason() {
use std::error::Error; use std::error::Error;
@@ -1601,15 +1602,18 @@ fn http2_body_user_error_sends_reset_reason() {
let mut rt = Runtime::new().expect("runtime new"); let mut rt = Runtime::new().expect("runtime new");
let err = rt.block_on({ let err: hyper::Error = rt.block_on(async move {
let client = Client::builder() let client = Client::builder()
.http2_only(true) .http2_only(true)
.build_http::<hyper::Body>(); .build_http::<hyper::Body>();
let uri = addr_str.parse().expect("server addr should parse"); let uri = addr_str.parse().expect("server addr should parse");
client let mut res = client.get(uri).await?;
.get(uri)
.and_then(|res| res.into_body().try_concat()) while let Some(chunk) = res.body_mut().next().await {
chunk?;
}
Ok(())
}).unwrap_err(); }).unwrap_err();
let h2_err = err let h2_err = err