Skip to content

Commit 1279129

Browse files
author
Iulian Barbu
committed
emoved tempfile dependency
Signed-off-by: Iulian Barbu <iul@amazon.com>
1 parent 8729510 commit 1279129

File tree

21 files changed

+195
-318
lines changed

21 files changed

+195
-318
lines changed

Cargo.lock

Lines changed: 12 additions & 142 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/devices/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ virtio_gen = { path = "../virtio_gen" }
1919

2020
[dev-dependencies]
2121
utils = { path = "../utils" }
22-
tempfile = ">=3.0.2"

src/devices/src/virtio/block.rs

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -654,20 +654,20 @@ impl VirtioDevice for Block {
654654

655655
#[cfg(test)]
656656
mod tests {
657-
extern crate tempfile;
657+
extern crate utils;
658658

659-
use self::tempfile::{tempfile, NamedTempFile};
660-
use super::*;
661-
662-
use libc;
663-
use memory_model::Address;
664659
use std::fs::{metadata, OpenOptions};
665660
use std::sync::mpsc::Receiver;
666661
use std::thread;
667662
use std::time::Duration;
668663
use std::u32;
669664

665+
use libc;
666+
667+
use self::utils::tempfile::TempFile;
668+
use super::*;
670669
use crate::virtio::queue::tests::*;
670+
use memory_model::Address;
671671

672672
const EPOLLIN: epoll::Events = epoll::Events::EPOLLIN;
673673

@@ -707,13 +707,23 @@ mod tests {
707707

708708
let epoll_config = EpollConfig::new(0, epoll_raw_fd, sender);
709709

710-
let f: File = tempfile().unwrap();
711-
f.set_len(0x1000).unwrap();
710+
let tmp_f = TempFile::new().unwrap();
711+
tmp_f.as_file().set_len(0x1000).unwrap();
712712

713713
// Rate limiting is enabled but with a high operation rate (10 million ops/s).
714714
let rate_limiter = RateLimiter::new(0, None, 0, 100_000, None, 10).unwrap();
715715
DummyBlock {
716-
block: Block::new(f, is_disk_read_only, epoll_config, Some(rate_limiter)).unwrap(),
716+
block: Block::new(
717+
OpenOptions::new()
718+
.read(true)
719+
.write(!is_disk_read_only)
720+
.open(tmp_f.as_path())
721+
.unwrap(),
722+
is_disk_read_only,
723+
epoll_config,
724+
Some(rate_limiter),
725+
)
726+
.unwrap(),
717727
epoll_raw_fd,
718728
_receiver,
719729
}
@@ -1513,8 +1523,8 @@ mod tests {
15131523

15141524
// test block device update handler
15151525
{
1516-
let f = NamedTempFile::new().unwrap();
1517-
let path = f.path().to_path_buf();
1526+
let f = TempFile::new().unwrap();
1527+
let path = f.as_path();
15181528
let mdata = metadata(&path).unwrap();
15191529
let mut id = vec![0; VIRTIO_BLK_ID_BYTES as usize];
15201530
let str_id = format!("{}{}{}", mdata.st_dev(), mdata.st_rdev(), mdata.st_ino());

src/firecracker/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ mmds = { path = "../mmds" }
1515
seccomp = { path = "../seccomp" }
1616
vmm = { path = "../vmm" }
1717

18-
[dev-dependencies]
19-
tempfile = ">=3.0.2"
18+
[dev-dependencies]

src/jailer/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ regex = ">=1.0.0"
1111
utils = { path = "../utils" }
1212

1313
[dev-dependencies]
14-
tempfile = ">=3.0.2"

0 commit comments

Comments
 (0)