Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Upgrade tokio to 1.10 #9575

Merged
11 commits merged into from
Aug 24, 2021
Merged

Upgrade tokio to 1.10 #9575

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e65cc47
Upgrade tokio to 1.10
bkchr Aug 17, 2021
748c51e
Fix test runner
bkchr Aug 17, 2021
c034ba1
Merge remote-tracking branch 'origin/master' into bkchr-upgrade-to-to…
bkchr Aug 17, 2021
d6baa23
Try fix it
bkchr Aug 19, 2021
1b526c1
Merge remote-tracking branch 'origin/master' into bkchr-upgrade-to-to…
bkchr Aug 23, 2021
d5d4ced
Update Cargo.lock
bkchr Aug 23, 2021
dd2ea7d
Review feedback
bkchr Aug 24, 2021
5050031
ahhhh
bkchr Aug 24, 2021
1a34cd5
FML
bkchr Aug 24, 2021
2bc50d9
FMT
bkchr Aug 24, 2021
5ef06ac
Fix tests
bkchr Aug 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix tests
  • Loading branch information
@bkchr
bkchr committed Aug 24, 2021
commit 5ef06ac9b2180c3b966d34356e9bb13ad147f27d
20 changes: 13 additions & 7 deletions client/service/src/task_manager/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ impl DropTester {
*self.0.lock() += 1;
DropTesterRef(self.clone())
}

fn wait_on_drop(&self) {
while *self != 0 {
std::thread::sleep(std::time::Duration::from_millis(10));
}
}
}

impl PartialEq<usize> for DropTester {
Expand Down Expand Up @@ -98,7 +104,7 @@ fn ensure_tasks_are_awaited_on_shutdown() {
runtime.block_on(async { tokio::time::sleep(Duration::from_secs(1)).await });
assert_eq!(drop_tester, 2);
runtime.block_on(task_manager.clean_shutdown());
assert_eq!(drop_tester, 0);
drop_tester.wait_on_drop();
}

#[test]
Expand All @@ -117,7 +123,7 @@ fn ensure_keep_alive_during_shutdown() {
runtime.block_on(async { tokio::time::sleep(Duration::from_secs(1)).await });
assert_eq!(drop_tester, 1);
runtime.block_on(task_manager.clean_shutdown());
assert_eq!(drop_tester, 0);
drop_tester.wait_on_drop();
}

#[test]
Expand Down Expand Up @@ -163,7 +169,7 @@ fn ensure_no_task_can_be_spawn_after_terminate() {
task_manager.terminate();
spawn_handle.spawn("task3", run_background_task(drop_tester.new_ref()));
runtime.block_on(task_manager.clean_shutdown());
assert_eq!(drop_tester, 0);
drop_tester.wait_on_drop();
}

#[test]
Expand Down Expand Up @@ -209,7 +215,7 @@ fn ensure_task_manager_future_ends_with_error_when_essential_task_fails() {
.expect_err("future()'s Result must be Err");
assert_eq!(drop_tester, 2);
runtime.block_on(task_manager.clean_shutdown());
assert_eq!(drop_tester, 0);
drop_tester.wait_on_drop();
}

#[test]
Expand Down Expand Up @@ -238,7 +244,7 @@ fn ensure_children_tasks_ends_when_task_manager_terminated() {
task_manager.terminate();
runtime.block_on(task_manager.future()).expect("future has ended without error");
runtime.block_on(task_manager.clean_shutdown());
assert_eq!(drop_tester, 0);
drop_tester.wait_on_drop();
}

#[test]
Expand Down Expand Up @@ -271,7 +277,7 @@ fn ensure_task_manager_future_ends_with_error_when_childs_essential_task_fails()
.expect_err("future()'s Result must be Err");
assert_eq!(drop_tester, 4);
runtime.block_on(task_manager.clean_shutdown());
assert_eq!(drop_tester, 0);
drop_tester.wait_on_drop();
}

#[test]
Expand Down Expand Up @@ -311,5 +317,5 @@ fn ensure_task_manager_future_continues_when_childs_not_essential_task_fails() {
});
assert_eq!(drop_tester, 4);
runtime.block_on(task_manager.clean_shutdown());
assert_eq!(drop_tester, 0);
drop_tester.wait_on_drop();
}