1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
|
Index: tower-http/src/compression/layer.rs
===================================================================
--- tower-http.orig/src/compression/layer.rs
+++ tower-http/src/compression/layer.rs
@@ -143,6 +143,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(all(feature = "compression-br", feature = "compression-deflate"))]
async fn accept_encoding_configuration_works() -> Result<(), crate::BoxError> {
let deflate_only_layer = CompressionLayer::new()
.quality(CompressionLevel::Best)
@@ -204,6 +205,7 @@ mod tests {
/// Test ensuring that zstd compression will not exceed an 8MiB window size; browsers do not
/// accept responses using 16MiB+ window sizes.
#[tokio::test]
+ #[cfg(feature = "compression-zstd")]
async fn zstd_is_web_safe() -> Result<(), crate::BoxError> {
async fn zeroes(_req: Request<Body>) -> Result<Response<Body>, Infallible> {
Ok(Response::new(Body::from(vec![0u8; 18_874_368])))
Index: tower-http/src/compression/mod.rs
===================================================================
--- tower-http.orig/src/compression/mod.rs
+++ tower-http/src/compression/mod.rs
@@ -93,6 +93,7 @@ mod tests {
use super::*;
use crate::test_helpers::{Body, WithTrailers};
+ #[cfg(feature = "compression-br")]
use async_compression::tokio::write::{BrotliDecoder, BrotliEncoder};
use flate2::read::GzDecoder;
use http::header::{
@@ -122,6 +123,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "compression-gzip")]
async fn gzip_works() {
let svc = service_fn(handle);
let mut svc = Compression::new(svc).compress_when(Always);
@@ -152,6 +154,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "compression-gzip")]
async fn x_gzip_works() {
let svc = service_fn(handle);
let mut svc = Compression::new(svc).compress_when(Always);
@@ -192,6 +195,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "compression-zstd")]
async fn zstd_works() {
let svc = service_fn(handle);
let mut svc = Compression::new(svc).compress_when(Always);
@@ -215,6 +219,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "compression-br")]
async fn no_recompress() {
const DATA: &str = "Hello, World! I'm already compressed with br!";
@@ -282,6 +287,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "compression-br")]
async fn will_not_compress_if_filtered_out() {
use predicate::Predicate;
@@ -364,6 +370,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "compression-gzip")]
async fn does_compress_svg() {
async fn handle(_req: Request<Body>) -> Result<Response<Body>, Infallible> {
let mut res = Response::new(Body::from(
@@ -389,6 +396,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "compression-br")]
async fn compress_with_quality() {
const DATA: &str = "Check compression quality level! Check compression quality level! Check compression quality level!";
let level = CompressionLevel::Best;
@@ -464,6 +472,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "compression-gzip")]
async fn should_strip_accept_ranges_header_when_compressing() {
let svc = service_fn(|_| async {
let mut res = Response::new(Body::from("Hello, World!"));
Index: tower-http/src/decompression/mod.rs
===================================================================
--- tower-http.orig/src/decompression/mod.rs
+++ tower-http/src/decompression/mod.rs
@@ -114,7 +114,9 @@ mod tests {
use super::*;
use crate::test_helpers::Body;
- use crate::{compression::Compression, test_helpers::WithTrailers};
+ #[cfg(any(feature = "compression-br", feature = "compression-deflate", feature = "compression-gzip", feature = "compression-zstd"))]
+ use crate::compression::Compression;
+ use crate::test_helpers::WithTrailers;
use flate2::write::GzEncoder;
use http::Response;
use http::{HeaderMap, HeaderName, Request};
@@ -122,6 +124,7 @@ mod tests {
use tower::{service_fn, Service, ServiceExt};
#[tokio::test]
+ #[cfg(feature = "compression-gzip")]
async fn works() {
let mut client = Decompression::new(Compression::new(service_fn(handle)));
@@ -151,6 +154,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "compression-gzip")]
async fn decompress_multi_gz() {
let mut client = Decompression::new(service_fn(handle_multi_gz));
@@ -169,6 +173,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "decompression-zstd")]
async fn decompress_multi_zstd() {
let mut client = Decompression::new(service_fn(handle_multi_zstd));
Index: tower-http/src/decompression/request/mod.rs
===================================================================
--- tower-http.orig/src/decompression/request/mod.rs
+++ tower-http/src/decompression/request/mod.rs
@@ -28,6 +28,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "decompression-gzip")]
async fn unaccepted_content_encoding_returns_unsupported_media_type() {
let req = request_gzip();
let mut svc = RequestDecompression::new(service_fn(should_not_be_called)).gzip(false);
@@ -36,6 +37,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "decompression-gzip")]
async fn pass_through_unsupported_encoding_when_enabled() {
let req = request_gzip();
let mut svc = RequestDecompression::new(service_fn(assert_request_is_passed_through))
Index: tower-http/src/request_id.rs
===================================================================
--- tower-http.orig/src/request_id.rs
+++ tower-http/src/request_id.rs
@@ -478,7 +478,7 @@ impl MakeRequestId for MakeRequestUuid {
}
}
-#[cfg(test)]
+#[cfg(all(test, feature = "util"))]
mod tests {
use crate::test_helpers::Body;
use crate::ServiceBuilderExt as _;
@@ -496,6 +496,7 @@ mod tests {
use super::*;
#[tokio::test]
+ #[cfg(feature = "util")]
async fn basic() {
let svc = ServiceBuilder::new()
.set_x_request_id(Counter::default())
Index: tower-http/src/services/fs/serve_file.rs
===================================================================
--- tower-http.orig/src/services/fs/serve_file.rs
+++ tower-http/src/services/fs/serve_file.rs
@@ -143,6 +143,7 @@ where
mod tests {
use crate::services::ServeFile;
use crate::test_helpers::Body;
+ #[cfg(feature = "compression-zstd")]
use async_compression::tokio::bufread::ZstdDecoder;
use brotli::BrotliDecompress;
use flate2::bufread::DeflateDecoder;
@@ -370,6 +371,7 @@ mod tests {
}
#[tokio::test]
+ #[cfg(feature = "compression-zstd")]
async fn precompressed_zstd() {
let svc = ServeFile::new(SERVE_FILE_PRECOMP).precompressed_zstd();
let request = Request::builder()
Index: tower-http/src/auth/async_require_authorization.rs
===================================================================
--- tower-http.orig/src/auth/async_require_authorization.rs
+++ tower-http/src/auth/async_require_authorization.rs
@@ -312,7 +312,7 @@ mod tests {
#[allow(unused_imports)]
use super::*;
use crate::test_helpers::Body;
- use futures_core::future::BoxFuture;
+ use futures_util::future::BoxFuture;
use http::{header, StatusCode};
use tower::{BoxError, ServiceBuilder, ServiceExt};
|
