Skip to content

Commit 5c6e992

Browse files
committed
remove newlines from tests for windows
1 parent 066c80a commit 5c6e992

File tree

2 files changed

+20
-24
lines changed

2 files changed

+20
-24
lines changed

tests/index.rs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,21 @@ async fn test_concurrent_requests() {
8585

8686
fn start_echo_server() -> ServerHandle {
8787
async fn echo_server(mut r: ServiceRequest) -> actix_web::Result<ServiceResponse> {
88-
let method = r.method();
89-
let path = r.uri();
90-
let mut headers_vec = r
91-
.headers()
92-
.into_iter()
93-
.map(|(k, v)| format!("{k}: {}", String::from_utf8_lossy(v.as_bytes())))
94-
.collect::<Vec<_>>();
95-
headers_vec.sort();
96-
let headers = headers_vec.join("\n");
97-
let mut resp_bytes = format!("{method} {path}\n{headers}\n\n").into_bytes();
98-
resp_bytes.extend(r.extract::<actix_web::web::Bytes>().await?);
99-
let resp = HttpResponse::Ok().body(resp_bytes);
88+
use std::io::Write;
89+
let mut f = Vec::new();
90+
write!(f, "{} {}", r.method(), r.uri()).unwrap();
91+
let mut sorted_headers = r.headers().into_iter().collect::<Vec<_>>();
92+
sorted_headers.sort_by_key(|(k, _)| k.as_str());
93+
for (k, v) in sorted_headers {
94+
if k.as_str().eq_ignore_ascii_case("date") {
95+
continue;
96+
}
97+
write!(f, "|{k}: ").unwrap();
98+
f.extend_from_slice(v.as_bytes());
99+
}
100+
f.push(b'|');
101+
f.extend_from_slice(&r.extract::<actix_web::web::Bytes>().await?);
102+
let resp = HttpResponse::Ok().body(f);
100103
Ok(r.into_response(resp))
101104
}
102105
let server = actix_web::HttpServer::new(move || {

tests/sql_test_files/it_works_fetch_post.sql

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,12 @@ set res = sqlpage.fetch('{
44
"headers": {"x-custom": "1"},
55
"body": {"hello": "world"}
66
}');
7-
set expected_like = 'POST /post
8-
accept-encoding: br, gzip, deflate, zstd
9-
content-length: 18
10-
content-type: application/json
11-
date: %
12-
host: localhost:62802
13-
x-custom: 1
14-
15-
{"hello": "world"}';
7+
set expected = 'POST /post|accept-encoding: br, gzip, deflate, zstd|content-length: 18|content-type: application/json|host: localhost:62802|x-custom: 1|{"hello": "world"}';
168
select 'text' as component,
17-
case
18-
when $res LIKE $expected_like then 'It works !'
9+
case $res
10+
when $expected then 'It works !'
1911
else 'It failed ! Expected:
20-
' || $expected_like || 'Got:
12+
' || $expected || '
13+
Got:
2114
' || $res
2215
end as contents;

0 commit comments

Comments
 (0)