Skip to content

Commit

Permalink
Merge pull request #140 from Carter12s/improve-test-reliability
Browse files Browse the repository at this point in the history
Trying to figure out which tests are flaky and fix, adding debug info…
  • Loading branch information
Carter12s authored Oct 24, 2023
2 parents 7c248ea + f1090e2 commit 923a6a6
Show file tree
Hide file tree
Showing 18 changed files with 186 additions and 192 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
`Insert description`

## Fixes
Issue Number: `number`
Closes: `number`

## Checklist
- [ ] Update CHANGELOG.md
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/galactic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:

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

jobs:
galactic:
Expand All @@ -22,6 +24,8 @@ jobs:
uses: actions/checkout@v3
with:
submodules: 'true'
- name: Verify rust version
run: source /root/.cargo/env; rustc --version
- name: Lint
run: source /root/.cargo/env; cargo fmt --all -- --check
- name: Build Main Lib
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/humble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:

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

jobs:
humble:
Expand All @@ -22,6 +24,8 @@ jobs:
uses: actions/checkout@v3
with:
submodules: 'true'
- name: Verify rust version
run: source /root/.cargo/env; rustc --version
- name: Lint
run: source /root/.cargo/env; cargo fmt --all -- --check
- name: Build Main Lib
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/noetic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ on:
env:
HOME: /root
ROS_PACKAGE_PATH: /opt/ros/noetic/share
# Coupled with our use of the test_log crate this should give us good CI output on failure
RUST_LOG: debug

jobs:
noetic:
Expand All @@ -23,6 +25,8 @@ jobs:
uses: actions/checkout@v3
with:
submodules: 'true'
- name: Verify rust version
run: source /root/.cargo/env; rustc --version
- name: Lint
run: source /root/.cargo/env; cargo fmt --all -- --check
- name: Build Main Lib
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/noetic_gencpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:

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

jobs:
noetic_gencpp:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- 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
grained control of message generation.
- The function interface for top level generation functions in `roslibrust_codegen` have been changed to include the list of dependent
filesystem paths that should trigger re-running code generation. Note: new files added to the search paths will not be automatically detected.

Expand Down
4 changes: 2 additions & 2 deletions roslibrust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ simple_logger = "2.1.0"

[features]
default = []
# Provides a rosapi rust interface
rosapi = []
# Note: all does not include running_bridge as that is only intended for CI
all = []
# Provides a rosapi rust interface
rosapi = []
# Intended for use with tests, includes tests that rely on a locally running rosbridge
running_bridge = []
# For use with integration tests, indicating we are testing integration with a ros1 bridge
Expand Down
2 changes: 1 addition & 1 deletion roslibrust/examples/native_ros1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

simple_logger::SimpleLogger::new()
Expand Down
2 changes: 1 addition & 1 deletion roslibrust/examples/ros1_listener.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ roslibrust_codegen_macro::find_and_generate_ros_messages!("assets/ros1_common_in

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

simple_logger::SimpleLogger::new()
Expand Down
2 changes: 1 addition & 1 deletion roslibrust/examples/ros1_talker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ roslibrust_codegen_macro::find_and_generate_ros_messages!("assets/ros1_common_in

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

simple_logger::SimpleLogger::new()
Expand Down
1 change: 1 addition & 0 deletions roslibrust/src/ros1/master_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ impl MasterClient {
self.client_uri.clone().into(),
],
)?;
log::trace!("Posting {body:?} to register publisher");
self.post(body).await
}

Expand Down
Loading

0 comments on commit 923a6a6

Please sign in to comment.