Skip to content

Commit a599be5

Browse files
committed
Try to avoid issues in sorting test by waiting after the locale has been set
1 parent 78b5aae commit a599be5

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
jobs:
1212
test_linux:
1313
name: Execute automated tests on Ubuntu Linux
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-24.04
1515
steps:
1616
- uses: actions/checkout@v2
1717
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
@@ -46,7 +46,7 @@ jobs:
4646
RUST_LOG: debug
4747
long_running_tests:
4848
name: Execute search tests
49-
runs-on: ubuntu-20.04
49+
runs-on: ubuntu-24.04
5050
env:
5151
RUST_LOG: debug
5252
steps:

.github/workflows/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
merge-request-checks:
1111
name: Run verify.sh
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- uses: actions/checkout@v4
1515
with:

graphannis/src/annis/db/sort_matches.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,12 @@ mod tests {
252252
#[cfg(target_os = "linux")]
253253
#[test]
254254
fn tiger_doc_name_sort_strcoll() {
255+
use std::time::Duration;
256+
255257
unsafe {
256258
let locale = CString::new("en_US.UTF-8").unwrap_or_default();
257259
libc::setlocale(libc::LC_COLLATE, locale.as_ptr());
260+
std::thread::sleep(Duration::from_millis(500));
258261
}
259262

260263
let p1 = "tiger2/tiger2/tiger_release_dec05_110";

0 commit comments

Comments
 (0)