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
|
Description: Serialize tests with race conditions
breezyshim's testing::TestEnv unconditionally accesses and modifies the
testing environment. This causes a race condition when tests that use it
are executed in parallel, making them fail sometimes. Fix: execute such
tests in series using serial_test.
Author: NoisyCoil <noisycoil@tutanota.com>
Last-Update: 2024-10-23
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: ognibuild/Cargo.toml
===================================================================
--- ognibuild.orig/Cargo.toml
+++ ognibuild/Cargo.toml
@@ -232,6 +232,9 @@ version = "1.0"
[dependencies.serde_yaml]
version = "0.9.34"
+[dependencies.serial_test]
+version = "2"
+
[dependencies.shlex]
version = "1.3.0"
Index: ognibuild/src/session/plain.rs
===================================================================
--- ognibuild.orig/src/session/plain.rs
+++ ognibuild/src/session/plain.rs
@@ -216,6 +216,7 @@ impl Session for PlainSession {
#[cfg(test)]
mod tests {
use super::*;
+ use serial_test::serial;
/*#[test]
fn test_prepend_user() {
@@ -360,6 +361,7 @@ mod tests {
#[cfg(feature = "breezy")]
#[test]
+ #[serial]
fn test_project_from_vcs() {
use breezyshim::tree::MutableTree;
let env = breezyshim::testing::TestEnv::new();
Index: ognibuild/src/debian/fix_build.rs
===================================================================
--- ognibuild.orig/src/debian/fix_build.rs
+++ ognibuild/src/debian/fix_build.rs
@@ -210,6 +210,7 @@ pub fn build_incrementally(
#[cfg(test)]
mod tests {
use super::*;
+ use serial_test::serial;
mod test_resolve_error {
use super::*;
use crate::debian::apt::AptManager;
@@ -323,6 +324,7 @@ Description: A python package
}
#[test]
+ #[serial]
fn test_missing_command_brz() {
let env = breezyshim::testing::TestEnv::new();
let td = tempfile::tempdir().unwrap();
|
