OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #79375 - vext01:kernel-copy-temps, r=bjorn3 

Make the kernel_copy tests more robust/concurrent.

These tests write to the same filenames in /tmp and in some cases these files don't get cleaned up properly. This caused issues for us when different users run the tests on the same system, e.g.:

```
---- sys::unix::kernel_copy::tests::bench_file_to_file_copy stdout ----
thread 'sys::unix::kernel_copy::tests::bench_file_to_file_copy' panicked at 'called `Result::unwrap()` on an `Err` value: Os { code: 13, kind: PermissionDenied, message: "Permission denied" }', library/std/src/sys/unix/kernel_copy/tests.rs:71:10
---- sys::unix::kernel_copy::tests::bench_file_to_socket_copy stdout ----
thread 'sys::unix::kernel_copy::tests::bench_file_to_socket_copy' panicked at 'called `Result::unwrap()` on an `Err` value: Os { code: 13, kind: PermissionDenied, message: "Permission denied" }', library/std/src/sys/unix/kernel_copy/tests.rs💯10
```

Use `std::sys_common::io__test::tmpdir()` to solve this.

CC ``@the8472.``
This commit is contained in:
Tyler Mandry 2020-12-10 21:33:02 -08:00 committed by GitHub
parent 1b4ffe4705 87c1fdbcfb
commit a8c19e1b48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
library/std/src/sys/unix/kernel_copy/tests.rs
View File

@ -1,18 +1,18 @@
use crate::env::temp_dir;
use crate::fs::OpenOptions;
use crate::io;
use crate::io::Result;
use crate::io::SeekFrom;
use crate::io::{BufRead, Read, Seek, Write};
use crate::os::unix::io::AsRawFd;
use crate::sys_common::io::test::tmpdir;
#[test]
fn copy_specialization() -> Result<()> {
use crate::io::{BufReader, BufWriter};
let path = crate::env::temp_dir();
let source_path = path.join("copy-spec.source");
let sink_path = path.join("copy-spec.sink");
let tmp_path = tmpdir();
let source_path = tmp_path.join("copy-spec.source");
let sink_path = tmp_path.join("copy-spec.sink");
let result: Result<()> = try {
let mut source = crate::fs::OpenOptions::new()
@ -68,7 +68,8 @@ fn copy_specialization() -> Result<()> {
#[bench]
fn bench_file_to_file_copy(b: &mut test::Bencher) {
const BYTES: usize = 128 * 1024;
let src_path = temp_dir().join("file-copy-bench-src");
let temp_path = tmpdir();
let src_path = temp_path.join("file-copy-bench-src");
let mut src = crate::fs::OpenOptions::new()
.create(true)
.truncate(true)
@ -78,7 +79,7 @@ fn bench_file_to_file_copy(b: &mut test::Bencher) {
.unwrap();
src.write(&vec![0u8; BYTES]).unwrap();
let sink_path = temp_dir().join("file-copy-bench-sink");
let sink_path = temp_path.join("file-copy-bench-sink");
let mut sink = crate::fs::OpenOptions::new()
.create(true)
.truncate(true)
@ -97,7 +98,8 @@ fn bench_file_to_file_copy(b: &mut test::Bencher) {
#[bench]
fn bench_file_to_socket_copy(b: &mut test::Bencher) {
const BYTES: usize = 128 * 1024;
let src_path = temp_dir().join("pipe-copy-bench-src");
let temp_path = tmpdir();
let src_path = temp_path.join("pipe-copy-bench-src");
let mut src = OpenOptions::new()
.create(true)
.truncate(true)
@ -128,7 +130,8 @@ fn bench_file_to_socket_copy(b: &mut test::Bencher) {
#[bench]
fn bench_file_to_uds_copy(b: &mut test::Bencher) {
const BYTES: usize = 128 * 1024;
let src_path = temp_dir().join("uds-copy-bench-src");
let temp_path = tmpdir();
let src_path = temp_path.join("uds-copy-bench-src");
let mut src = OpenOptions::new()
.create(true)
.truncate(true)