Skip to content

Commit 666b7d7

Browse files
authored
fix: stuck integration test and CI artifact saving (#503)
1 parent 11a500f commit 666b7d7

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

.github/workflows/common-testing.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ jobs:
446446
SLACK_MESSAGE: "${{ steps.tests.outcome }} \nFor args: ${{ inputs.args-tests }}"
447447

448448
- name: Generate unique ID
449+
if: always()
449450
id: unique-id
450451
run: echo "id=$(date "+%s%N" | md5sum | head -c 8)" >> "$GITHUB_OUTPUT"
451452
shell: bash

core/service/tests/integration_test.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,19 @@ fn kill_process(process_name: &str) {
3030
&& let Some(s) = path.to_str()
3131
&& s.contains(process_name)
3232
{
33-
tracing::error!(
34-
process_name = %process_name,
35-
pid = %pid,
36-
"Failed to kill matching process during integration test cleanup"
37-
);
33+
if process.kill() {
34+
tracing::info!(
35+
process_name = %process_name,
36+
pid = %pid,
37+
"Killed matching process during integration test cleanup"
38+
);
39+
} else {
40+
tracing::warn!(
41+
process_name = %process_name,
42+
pid = %pid,
43+
"Failed to kill matching process during integration test cleanup"
44+
);
45+
}
3846
}
3947
}
4048
}

0 commit comments

Comments
 (0)