Skip to content

Commit 923a6a6

Browse files
authored
Merge pull request ros2#140 from Carter12s/improve-test-reliability
Trying to figure out which tests are flaky and fix, adding debug info…
2 parents 7c248ea + f1090e2 commit 923a6a6

18 files changed

Lines changed: 186 additions & 192 deletions

File tree

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
`Insert description`
33

44
## Fixes
5-
Issue Number: `number`
5+
Closes: `number`
66

77
## Checklist
88
- [ ] Update CHANGELOG.md

.github/workflows/galactic.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88

99
env:
1010
HOME: /root
11+
# Coupled with our use of the test_log crate this should give us good CI output on failure
12+
RUST_LOG: debug
1113

1214
jobs:
1315
galactic:
@@ -22,6 +24,8 @@ jobs:
2224
uses: actions/checkout@v3
2325
with:
2426
submodules: 'true'
27+
- name: Verify rust version
28+
run: source /root/.cargo/env; rustc --version
2529
- name: Lint
2630
run: source /root/.cargo/env; cargo fmt --all -- --check
2731
- name: Build Main Lib

.github/workflows/humble.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88

99
env:
1010
HOME: /root
11+
# Coupled with our use of the test_log crate this should give us good CI output on failure
12+
RUST_LOG: debug
1113

1214
jobs:
1315
humble:
@@ -22,6 +24,8 @@ jobs:
2224
uses: actions/checkout@v3
2325
with:
2426
submodules: 'true'
27+
- name: Verify rust version
28+
run: source /root/.cargo/env; rustc --version
2529
- name: Lint
2630
run: source /root/.cargo/env; cargo fmt --all -- --check
2731
- name: Build Main Lib

.github/workflows/noetic.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ on:
99
env:
1010
HOME: /root
1111
ROS_PACKAGE_PATH: /opt/ros/noetic/share
12+
# Coupled with our use of the test_log crate this should give us good CI output on failure
13+
RUST_LOG: debug
1214

1315
jobs:
1416
noetic:
@@ -23,6 +25,8 @@ jobs:
2325
uses: actions/checkout@v3
2426
with:
2527
submodules: 'true'
28+
- name: Verify rust version
29+
run: source /root/.cargo/env; rustc --version
2630
- name: Lint
2731
run: source /root/.cargo/env; cargo fmt --all -- --check
2832
- name: Build Main Lib

.github/workflows/noetic_gencpp.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88

99
env:
1010
HOME: /root
11+
# Coupled with our use of the test_log crate this should give us good CI output on failure
12+
RUST_LOG: debug
1113

1214
jobs:
1315
noetic_gencpp:

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3030

3131
### Changed
3232

33+
- Removed `find_and_generate_ros_messages_relative_to_manifest_dir!` this proc_macro was changing the current working directory of the compilation job resulting in a variety of strange compilation behaviors. Build.rs scripts are recommended for use cases requiring fine
34+
grained control of message generation.
3335
- The function interface for top level generation functions in `roslibrust_codegen` have been changed to include the list of dependent
3436
filesystem paths that should trigger re-running code generation. Note: new files added to the search paths will not be automatically detected.
3537

roslibrust/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ simple_logger = "2.1.0"
5353

5454
[features]
5555
default = []
56-
# Provides a rosapi rust interface
57-
rosapi = []
5856
# Note: all does not include running_bridge as that is only intended for CI
5957
all = []
58+
# Provides a rosapi rust interface
59+
rosapi = []
6060
# Intended for use with tests, includes tests that rely on a locally running rosbridge
6161
running_bridge = []
6262
# For use with integration tests, indicating we are testing integration with a ros1 bridge

roslibrust/examples/native_ros1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#[cfg(feature = "ros1")]
66
#[tokio::main]
7-
async fn main() -> Result<(), Box<dyn std::error::Error>> {
7+
async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
88
use roslibrust::NodeHandle;
99

1010
simple_logger::SimpleLogger::new()

roslibrust/examples/ros1_listener.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ roslibrust_codegen_macro::find_and_generate_ros_messages!("assets/ros1_common_in
22

33
#[cfg(feature = "ros1")]
44
#[tokio::main]
5-
async fn main() -> Result<(), Box<dyn std::error::Error>> {
5+
async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
66
use roslibrust::NodeHandle;
77

88
simple_logger::SimpleLogger::new()

roslibrust/examples/ros1_talker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ roslibrust_codegen_macro::find_and_generate_ros_messages!("assets/ros1_common_in
22

33
#[cfg(feature = "ros1")]
44
#[tokio::main]
5-
async fn main() -> Result<(), Box<dyn std::error::Error>> {
5+
async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
66
use roslibrust::NodeHandle;
77

88
simple_logger::SimpleLogger::new()

0 commit comments

Comments
 (0)