Skip to content

Commit 6db891f

Browse files
Get rid of local_test feature
As we fixed those tests and made them run on CI
1 parent f420970 commit 6db891f

5 files changed

Lines changed: 7 additions & 10 deletions

File tree

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ jobs:
6969
7070
- name: Test (native)
7171
run: |
72-
cargo test --manifest-path ./client/Cargo.toml --no-default-features --features tokio --features native_crypto,local_tests
72+
cargo test --manifest-path ./client/Cargo.toml --no-default-features --features tokio --features native_crypto
7373
- name: Test (OpenSSL)
7474
run: |
75-
cargo test --manifest-path ./client/Cargo.toml --no-default-features --features tokio --features openssl_crypto,local_tests
75+
cargo test --manifest-path ./client/Cargo.toml --no-default-features --features tokio --features openssl_crypto
7676
7777
- name: Test Server (native)
7878
run: |

.github/workflows/coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
--package oo7 \
6161
--lib \
6262
--no-default-features \
63-
--features "tracing,tokio,native_crypto,local_tests" \
63+
--features "tracing,tokio,native_crypto" \
6464
--ignore-panics \
6565
--out Lcov \
6666
--output-dir coverage-raw
@@ -72,7 +72,7 @@ jobs:
7272
--package oo7 \
7373
--lib \
7474
--no-default-features \
75-
--features "tracing,async-std,openssl_crypto,local_tests" \
75+
--features "tracing,async-std,openssl_crypto" \
7676
--ignore-panics \
7777
--out Lcov \
7878
--output-dir coverage-raw

client/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
5757
tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
5858

5959
[features]
60-
default = ["local_tests", "tokio", "native_crypto"]
61-
# Some tests requires a prompt to be displayed, which can't be easily
62-
# handled in CI unless we write a mock service. The feature allows to disabling those tests in CI
63-
local_tests = []
60+
default = ["tokio", "native_crypto"]
6461
# Enables unstable low-level API
6562
unstable = []
6663
async-std = [

client/src/dbus/collection.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ impl<'a> Collection<'a> {
255255
}
256256

257257
#[cfg(test)]
258-
#[cfg(all(feature = "tokio", feature = "local_tests"))]
258+
#[cfg(feature = "tokio")]
259259
mod tests {
260260
use std::collections::HashMap;
261261

client/src/dbus/service.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ impl<'a> Service<'a> {
226226
}
227227

228228
#[cfg(test)]
229-
#[cfg(all(feature = "tokio", feature = "local_tests"))]
229+
#[cfg(feature = "tokio")]
230230
mod tests {
231231
use super::Service;
232232

0 commit comments

Comments
 (0)