Skip to content

Commit 8a753a7

Browse files
authored
Cache openssl for Windows action (#11)
* add openssl cache * Fail fast for win * fix timeouts in test
1 parent 1133545 commit 8a753a7

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

.github/workflows/linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
path: ~/.cargo/bin
5656
key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-tarpaulin
5757

58-
- name: tests
58+
- name: Run tests
5959
uses: actions-rs/cargo@v1
6060
timeout-minutes: 40
6161
with:
@@ -68,7 +68,7 @@ jobs:
6868
run: |
6969
cargo install cargo-tarpaulin
7070
71-
- name: Generate coverage file
71+
- name: Generate coverage report
7272
if: matrix.version == '1.42.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
7373
continue-on-error: true
7474
run: |

.github/workflows/osx.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,7 @@ jobs:
4747
path: target
4848
key: ${{ matrix.version }}-x86_64-apple-darwin-cargo-build-trimmed-${{ hashFiles('**/Cargo.lock') }}
4949

50-
- name: check build
51-
uses: actions-rs/cargo@v1
52-
with:
53-
command: check
54-
args: --all --all-features --bins --examples --tests
55-
56-
- name: tests
50+
- name: Run tests
5751
uses: actions-rs/cargo@v1
5852
with:
5953
command: test

.github/workflows/windows.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ jobs:
2727
profile: minimal
2828
override: true
2929

30+
- name: Cache vcpkg
31+
uses: actions/cache@v1
32+
with:
33+
path: C:\vcpkg\installed\x64-windows\
34+
key: x86_64-pc-windows-msvc-openssl
35+
3036
- name: Install OpenSSL
3137
run: |
3238
vcpkg integrate install
@@ -36,8 +42,8 @@ jobs:
3642
Get-ChildItem C:\vcpkg\installed\x64-windows\bin
3743
Get-ChildItem C:\vcpkg\installed\x64-windows\lib
3844
39-
- name: tests
45+
- name: Run tests
4046
uses: actions-rs/cargo@v1
4147
with:
4248
command: test
43-
args: --all --all-features --no-fail-fast -- --nocapture
49+
args: --all --all-features -- --nocapture

ntex/tests/http_awc_client.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ async fn test_with_query_parameter() {
376376
}))
377377
});
378378

379-
let res = Client::new().get(srv.url("/?qp=5")).send().await.unwrap();
379+
let res = srv.get("/?qp=5").send().await.unwrap();
380380
assert!(res.status().is_success());
381381
}
382382

@@ -392,7 +392,9 @@ async fn test_no_decompress() {
392392
})))
393393
});
394394

395-
let mut res = Client::new()
395+
let client = Client::build().timeout(Duration::from_secs(30)).finish();
396+
397+
let mut res = client
396398
.get(srv.url("/"))
397399
.no_decompress()
398400
.send()
@@ -409,7 +411,7 @@ async fn test_no_decompress() {
409411
assert_eq!(Bytes::from(dec), Bytes::from_static(STR.as_ref()));
410412

411413
// POST
412-
let mut res = Client::new()
414+
let mut res = client
413415
.post(srv.url("/"))
414416
.no_decompress()
415417
.send()

ntex/tests/http_rustls.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ async fn test_h2_content_length() {
151151
for i in 0..4 {
152152
let req = srv
153153
.srequest(Method::GET, &format!("/{}", i))
154-
.timeout(Duration::from_secs(10))
154+
.timeout(Duration::from_secs(30))
155155
.send();
156156
let response = req.await.unwrap();
157157
assert_eq!(response.headers().get(&header), None);
158158

159159
let req = srv
160160
.srequest(Method::HEAD, &format!("/{}", i))
161-
.timeout(Duration::from_secs(10))
161+
.timeout(Duration::from_secs(30))
162162
.send();
163163
let response = req.await.unwrap();
164164
assert_eq!(response.headers().get(&header), None);
@@ -167,7 +167,7 @@ async fn test_h2_content_length() {
167167
for i in 4..6 {
168168
let req = srv
169169
.srequest(Method::GET, &format!("/{}", i))
170-
.timeout(Duration::from_secs(10))
170+
.timeout(Duration::from_secs(30))
171171
.send();
172172
let response = req.await.unwrap();
173173
assert_eq!(response.headers().get(&header), Some(&value));

0 commit comments

Comments
 (0)