Skip to content

Commit bf7f9b6

Browse files
committed
fix: this time github it works.
1 parent 6861eee commit bf7f9b6

File tree

4 files changed

+22
-3
lines changed

4 files changed

+22
-3
lines changed

.cargo/config.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ coverage = [
3535
"xtask",
3636
"--out", "Html",
3737
"--out", "Xml",
38-
"--",
39-
"--test-threads=1"
4038
]
4139

4240
[env]

.github/workflows/tests.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ jobs:
2929
run: cargo xtask dependencies -dip sudo
3030

3131
- name: build integration coverage
32+
run: /usr/local/cargo/bin/cargo +nightly build-coverage
33+
env:
34+
RAR_AUTHENTICATION: skip
35+
RAR_CFG_PATH: target/rootasrole.json
36+
SKIP_BUILD: true
37+
38+
- name: run integration coverage
3239
run: sudo -E /usr/local/cargo/bin/cargo +nightly coverage
3340
env:
3441
RAR_AUTHENTICATION: skip

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ libseccomp = { version = "0.3", optional = true }
105105
log = "0.4"
106106
env_logger = "0.11"
107107
test-log = { version = "0.2" }
108+
serial_test = "3.2.0"
108109

109110

110111
[package.metadata.deb]

tests/integration_tests.rs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ mod helpers;
66
#[cfg(test)]
77
mod tests {
88
use pcre2::bytes::RegexBuilder;
9+
use serial_test::serial;
910

1011
use crate::helpers::get_test_runner;
1112

1213
#[test]
14+
#[serial]
1315
fn test_dosr_help() {
1416
let runner = get_test_runner().expect("Failed to setup test environment");
1517
let result = runner
@@ -23,6 +25,7 @@ mod tests {
2325
}
2426

2527
#[test]
28+
#[serial]
2629
fn test_dosr_version() {
2730
let runner = get_test_runner().expect("Failed to setup test environment");
2831
let result = runner
@@ -38,6 +41,7 @@ mod tests {
3841
}
3942

4043
#[test]
44+
#[serial]
4145
fn test_dosr_role_selection() {
4246
let runner = get_test_runner().expect("Failed to setup test environment");
4347
let result = runner
@@ -52,6 +56,7 @@ mod tests {
5256
}
5357

5458
#[test]
59+
#[serial]
5560
fn test_dosr_task_selection() {
5661
let runner = get_test_runner().expect("Failed to setup test environment");
5762
let result = runner
@@ -66,6 +71,7 @@ mod tests {
6671
}
6772

6873
#[test]
74+
#[serial]
6975
fn test_dosr_invalid_role() {
7076
let runner = get_test_runner().expect("Failed to setup test environment");
7177
let result = runner
@@ -81,6 +87,7 @@ mod tests {
8187
}
8288

8389
#[test]
90+
#[serial]
8491
fn test_dosr_env_override() {
8592
let runner = get_test_runner().expect("Failed to setup test environment");
8693
let result = runner
@@ -98,6 +105,7 @@ mod tests {
98105
}
99106

100107
#[test]
108+
#[serial]
101109
fn test_dosr_env_override_not_overriden() {
102110
let runner = get_test_runner().expect("Failed to setup test environment");
103111
let result = runner
@@ -115,6 +123,7 @@ mod tests {
115123
}
116124

117125
#[test]
126+
#[serial]
118127
fn test_dosr_env_override_denied() {
119128
let runner = get_test_runner().expect("Failed to setup test environment");
120129
let result = runner
@@ -133,6 +142,7 @@ mod tests {
133142
}
134143

135144
#[test]
145+
#[serial]
136146
fn test_dosr_env_override_denied_not_overriden() {
137147
let runner = get_test_runner().expect("Failed to setup test environment");
138148
let result = runner
@@ -150,6 +160,7 @@ mod tests {
150160
}
151161

152162
#[test]
163+
#[serial]
153164
fn test_dosr_as_user() {
154165
let runner = get_test_runner().expect("Failed to setup test environment");
155166
let result = runner
@@ -165,6 +176,7 @@ mod tests {
165176

166177

167178
#[test]
179+
#[serial]
168180
fn test_dosr_as_group() {
169181
let runner = get_test_runner().expect("Failed to setup test environment");
170182
let result = runner
@@ -179,8 +191,9 @@ mod tests {
179191
}
180192

181193
#[test]
194+
#[serial]
182195
fn test_dosr_as_user_and_group() {
183-
let runner = get_test_runner().expect("Failed to setup test environment");
196+
let runner = get_test_runner().inspect_err(|e| eprintln!("Failed to setup test environment: {}",e)).unwrap();
184197
let result = runner
185198
.run_dosr(&["-u", "nobody", "-g", "daemon,nobody", "id"])
186199
.fixture_name("tests/fixtures/user_group.json")

0 commit comments

Comments
 (0)