mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-07 21:27:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

tests: use pollster instead of futures::executor::block_on()

Browse source 
It doesn't matter in tests and I have no preference over these, but we tend
to use .block_on().
This commit is contained in:
Yuya Nishihara 2024-08-05 17:49:11 +09:00
parent 26f744ab2d
commit 63e254d052
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/tests/test_merged_tree.rs
View file

@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
use futures::executor::block_on;
use futures::StreamExt; use futures::StreamExt;
use itertools::Itertools; use itertools::Itertools;
use jj_lib::backend::{FileId, MergedTreeId, TreeValue}; use jj_lib::backend::{FileId, MergedTreeId, TreeValue};
@ -25,6 +24,7 @@ use jj_lib::merged_tree::{
use jj_lib::repo::Repo; use jj_lib::repo::Repo;
use jj_lib::repo_path::{RepoPath, RepoPathBuf, RepoPathComponent}; use jj_lib::repo_path::{RepoPath, RepoPathBuf, RepoPathComponent};
use jj_lib::tree::merge_trees; use jj_lib::tree::merge_trees;
use pollster::FutureExt as _;
use pretty_assertions::assert_eq; use pretty_assertions::assert_eq;
use testutils::{create_single_tree, write_file, TestRepo}; use testutils::{create_single_tree, write_file, TestRepo};
@ -40,11 +40,11 @@ fn diff_stream_equals_iter(tree1: &MergedTree, tree2: &MergedTree, matcher: &dyn
.map(|(path, diff)| (path, diff.unwrap())) .map(|(path, diff)| (path, diff.unwrap()))
.collect(); .collect();
let max_concurrent_reads = 10; let max_concurrent_reads = 10;
let stream_diff: Vec<_> = block_on( let stream_diff: Vec<_> =
TreeDiffStreamImpl::new(tree1.clone(), tree2.clone(), matcher, max_concurrent_reads) TreeDiffStreamImpl::new(tree1.clone(), tree2.clone(), matcher, max_concurrent_reads)
.map(|(path, diff)| (path, diff.unwrap())) .map(|(path, diff)| (path, diff.unwrap()))
.collect(), .collect()
); .block_on();
assert_eq!(stream_diff, iter_diff); assert_eq!(stream_diff, iter_diff);
} }